Browse Source

栈板箱卡通箱核对,包装称重界面打多个箱标,在线打印机身标

callm 1 year ago
parent
commit
950fe833f0

+ 245 - 0
UAS_MES_LGDZ/FunctionCode/Make/Make_OutBoxSnCheck.Designer.cs

@@ -0,0 +1,245 @@
+namespace UAS_MES_NEW.Make
+{
+    partial class Make_OutBoxSnCheck
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Make_OutBoxSnCheck));
+            this.label10 = new System.Windows.Forms.Label();
+            this.CheckSnDGV = new System.Windows.Forms.DataGridView();
+            this.label1 = new System.Windows.Forms.Label();
+            this.label2 = new System.Windows.Forms.Label();
+            this.CheckLabel = new System.Windows.Forms.Label();
+            this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pa_outboxcode = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.SnCollectionBox();
+            this.pd_barcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pd_checksn = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.cancel = new UAS_MES_NEW.CustomControl.ButtonUtil.NormalButton();
+            this.sncode = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.SnCollectionBox();
+            this.OperateResult = new UAS_MES_NEW.CustomControl.RichText.RichTextAutoBottom();
+            ((System.ComponentModel.ISupportInitialize)(this.CheckSnDGV)).BeginInit();
+            this.SuspendLayout();
+            // 
+            // label10
+            // 
+            this.label10.AutoSize = true;
+            this.label10.Font = new System.Drawing.Font("微软雅黑", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label10.Location = new System.Drawing.Point(66, 790);
+            this.label10.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label10.Name = "label10";
+            this.label10.Size = new System.Drawing.Size(69, 35);
+            this.label10.TabIndex = 12;
+            this.label10.Text = "箱号";
+            // 
+            // CheckSnDGV
+            // 
+            this.CheckSnDGV.AllowUserToAddRows = false;
+            this.CheckSnDGV.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+            this.CheckSnDGV.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+            this.pd_barcode,
+            this.pd_checksn});
+            this.CheckSnDGV.Location = new System.Drawing.Point(72, 137);
+            this.CheckSnDGV.Name = "CheckSnDGV";
+            this.CheckSnDGV.RowHeadersWidth = 82;
+            this.CheckSnDGV.RowTemplate.Height = 37;
+            this.CheckSnDGV.Size = new System.Drawing.Size(1117, 624);
+            this.CheckSnDGV.TabIndex = 18;
+            // 
+            // label1
+            // 
+            this.label1.AutoSize = true;
+            this.label1.Font = new System.Drawing.Font("宋体", 24F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label1.Location = new System.Drawing.Point(66, 46);
+            this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label1.Name = "label1";
+            this.label1.Size = new System.Drawing.Size(219, 64);
+            this.label1.TabIndex = 19;
+            this.label1.Text = "栈板号";
+            // 
+            // label2
+            // 
+            this.label2.AutoSize = true;
+            this.label2.Font = new System.Drawing.Font("宋体", 24F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label2.Location = new System.Drawing.Point(1165, 46);
+            this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label2.Name = "label2";
+            this.label2.Size = new System.Drawing.Size(283, 64);
+            this.label2.TabIndex = 21;
+            this.label2.Text = "检验箱数";
+            // 
+            // CheckLabel
+            // 
+            this.CheckLabel.AutoSize = true;
+            this.CheckLabel.Font = new System.Drawing.Font("宋体", 24F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.CheckLabel.Location = new System.Drawing.Point(1456, 46);
+            this.CheckLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.CheckLabel.Name = "CheckLabel";
+            this.CheckLabel.Size = new System.Drawing.Size(0, 64);
+            this.CheckLabel.TabIndex = 22;
+            // 
+            // dataGridViewTextBoxColumn1
+            // 
+            this.dataGridViewTextBoxColumn1.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCells;
+            this.dataGridViewTextBoxColumn1.DataPropertyName = "pa_outboxcode";
+            this.dataGridViewTextBoxColumn1.HeaderText = "箱内序列号";
+            this.dataGridViewTextBoxColumn1.MinimumWidth = 10;
+            this.dataGridViewTextBoxColumn1.Name = "dataGridViewTextBoxColumn1";
+            this.dataGridViewTextBoxColumn1.Width = 175;
+            // 
+            // dataGridViewTextBoxColumn2
+            // 
+            this.dataGridViewTextBoxColumn2.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCells;
+            this.dataGridViewTextBoxColumn2.DataPropertyName = "pd_checksn";
+            this.dataGridViewTextBoxColumn2.HeaderText = "扫描SN号";
+            this.dataGridViewTextBoxColumn2.MinimumWidth = 10;
+            this.dataGridViewTextBoxColumn2.Name = "dataGridViewTextBoxColumn2";
+            this.dataGridViewTextBoxColumn2.Width = 151;
+            // 
+            // pa_outboxcode
+            // 
+            this.pa_outboxcode.AllPower = null;
+            this.pa_outboxcode.BackColor = System.Drawing.Color.White;
+            this.pa_outboxcode.Font = new System.Drawing.Font("宋体", 24F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.pa_outboxcode.ID = null;
+            this.pa_outboxcode.Location = new System.Drawing.Point(358, 43);
+            this.pa_outboxcode.Margin = new System.Windows.Forms.Padding(4);
+            this.pa_outboxcode.Name = "pa_outboxcode";
+            this.pa_outboxcode.Power = null;
+            this.pa_outboxcode.Size = new System.Drawing.Size(773, 80);
+            this.pa_outboxcode.Str = null;
+            this.pa_outboxcode.Str1 = null;
+            this.pa_outboxcode.Str2 = null;
+            this.pa_outboxcode.TabIndex = 20;
+            this.pa_outboxcode.KeyDown += new System.Windows.Forms.KeyEventHandler(this.pa_outboxcode_KeyDown);
+            // 
+            // pd_barcode
+            // 
+            this.pd_barcode.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCells;
+            this.pd_barcode.DataPropertyName = "pa_outboxcode";
+            this.pd_barcode.HeaderText = "箱内序列号";
+            this.pd_barcode.MinimumWidth = 10;
+            this.pd_barcode.Name = "pd_barcode";
+            this.pd_barcode.Width = 175;
+            // 
+            // pd_checksn
+            // 
+            this.pd_checksn.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCells;
+            this.pd_checksn.DataPropertyName = "pd_checksn";
+            this.pd_checksn.HeaderText = "扫描SN号";
+            this.pd_checksn.MinimumWidth = 10;
+            this.pd_checksn.Name = "pd_checksn";
+            this.pd_checksn.Width = 151;
+            // 
+            // cancel
+            // 
+            this.cancel.AllPower = null;
+            this.cancel.BackColor = System.Drawing.Color.Transparent;
+            this.cancel.DownImage = ((System.Drawing.Image)(resources.GetObject("cancel.DownImage")));
+            this.cancel.Image = null;
+            this.cancel.IsShowBorder = true;
+            this.cancel.Location = new System.Drawing.Point(580, 790);
+            this.cancel.Margin = new System.Windows.Forms.Padding(4);
+            this.cancel.MoveImage = ((System.Drawing.Image)(resources.GetObject("cancel.MoveImage")));
+            this.cancel.Name = "cancel";
+            this.cancel.NormalImage = ((System.Drawing.Image)(resources.GetObject("cancel.NormalImage")));
+            this.cancel.Power = null;
+            this.cancel.Size = new System.Drawing.Size(118, 38);
+            this.cancel.TabIndex = 17;
+            this.cancel.Text = "重新核对";
+            this.cancel.UseVisualStyleBackColor = false;
+            this.cancel.Click += new System.EventHandler(this.cancel_Click);
+            // 
+            // sncode
+            // 
+            this.sncode.AllPower = null;
+            this.sncode.BackColor = System.Drawing.Color.White;
+            this.sncode.ID = null;
+            this.sncode.Location = new System.Drawing.Point(146, 790);
+            this.sncode.Margin = new System.Windows.Forms.Padding(4);
+            this.sncode.Name = "sncode";
+            this.sncode.Power = null;
+            this.sncode.Size = new System.Drawing.Size(334, 35);
+            this.sncode.Str = null;
+            this.sncode.Str1 = null;
+            this.sncode.Str2 = null;
+            this.sncode.TabIndex = 14;
+            this.sncode.KeyDown += new System.Windows.Forms.KeyEventHandler(this.sncode_KeyDown);
+            // 
+            // OperateResult
+            // 
+            this.OperateResult.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.OperateResult.Location = new System.Drawing.Point(1223, 137);
+            this.OperateResult.Margin = new System.Windows.Forms.Padding(4);
+            this.OperateResult.Name = "OperateResult";
+            this.OperateResult.Size = new System.Drawing.Size(518, 624);
+            this.OperateResult.TabIndex = 10;
+            this.OperateResult.Text = "";
+            // 
+            // Make_OutBoxSnCheck
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 24F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(1772, 866);
+            this.Controls.Add(this.CheckLabel);
+            this.Controls.Add(this.label2);
+            this.Controls.Add(this.pa_outboxcode);
+            this.Controls.Add(this.label1);
+            this.Controls.Add(this.CheckSnDGV);
+            this.Controls.Add(this.cancel);
+            this.Controls.Add(this.sncode);
+            this.Controls.Add(this.label10);
+            this.Controls.Add(this.OperateResult);
+            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
+            this.Margin = new System.Windows.Forms.Padding(4);
+            this.Name = "Make_OutBoxSnCheck";
+            this.Tag = "Make!LabelCheck";
+            this.Text = "标签核对";
+            this.Load += new System.EventHandler(this.Make_LabelCheck_Load);
+            this.SizeChanged += new System.EventHandler(this.Make_LabelCheck_SizeChanged);
+            ((System.ComponentModel.ISupportInitialize)(this.CheckSnDGV)).EndInit();
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+        }
+
+        #endregion
+        private System.Windows.Forms.Label label10;
+        private CustomControl.TextBoxWithIcon.SnCollectionBox sncode;
+        private CustomControl.ButtonUtil.NormalButton cancel;
+        private CustomControl.RichText.RichTextAutoBottom OperateResult;
+        private System.Windows.Forms.DataGridView CheckSnDGV;
+        private CustomControl.TextBoxWithIcon.SnCollectionBox pa_outboxcode;
+        private System.Windows.Forms.Label label1;
+        private System.Windows.Forms.DataGridViewTextBoxColumn pd_barcode;
+        private System.Windows.Forms.DataGridViewTextBoxColumn pd_checksn;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn1;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn2;
+        private System.Windows.Forms.Label label2;
+        private System.Windows.Forms.Label CheckLabel;
+    }
+}

+ 133 - 0
UAS_MES_LGDZ/FunctionCode/Make/Make_OutBoxSnCheck.cs

@@ -0,0 +1,133 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Windows.Forms;
+using UAS_MES_NEW.DataOperate;
+using UAS_MES_NEW.Entity;
+using UAS_MES_NEW.PublicForm;
+using UAS_MES_NEW.PublicMethod;
+
+namespace UAS_MES_NEW.Make
+{
+    public partial class Make_OutBoxSnCheck : Form
+    {
+        AutoSizeFormClass asc = new AutoSizeFormClass();
+
+        DataHelper dh;
+
+        LogStringBuilder sql;
+
+        DataTable dt;
+
+        public Make_OutBoxSnCheck()
+        {
+            InitializeComponent();
+        }
+
+        private void Make_LabelCheck_Load(object sender, EventArgs e)
+        {
+            asc.controllInitializeSize(this);
+            //聚焦SN号
+            pa_outboxcode.Focus();
+            //打开界面提示用户:请输入SN 
+            OperateResult.AppendText(">>请采集箱号\n", Color.Black);
+            sql = new LogStringBuilder();
+            dh = SystemInf.dh;
+        }
+
+        private void Make_LabelCheck_SizeChanged(object sender, EventArgs e)
+        {
+            asc.controlAutoSize(this);
+        }
+        int CheckCount = 0;
+
+        private void sncode_KeyDown(object sender, KeyEventArgs e)
+        {
+            //判断是enter事件
+            if (e.KeyCode == Keys.Enter)
+            {
+                if (sncode.Text == "")
+                {
+                    OperateResult.AppendText("<<输入不能为空\n", Color.Red);
+                    return;
+                }
+                bool FindSN = false;
+                bool AllCheck = true;
+                for (int i = 0; i < CheckSnDGV.Rows.Count; i++)
+                {
+                    if (CheckSnDGV.Rows[i].Cells["pd_checksn"].Value != null && CheckSnDGV.Rows[i].Cells["pd_checksn"].Value.ToString() == sncode.Text)
+                    {
+                        OperateResult.AppendText("<<" + sncode.Text + "已校验\n", Color.Red);
+                        return;
+                    }
+                    if (CheckSnDGV.Rows[i].Cells["pd_barcode"].Value.ToString() == sncode.Text)
+                    {
+                        CheckSnDGV.Rows[i].Cells["pd_checksn"].Value = sncode.Text;
+                        FindSN = true;
+                    }
+                    if (CheckSnDGV.Rows[i].Cells["pd_checksn"].Value == null)
+                    {
+                        AllCheck = false;
+                    }
+                }
+                if (FindSN)
+                {
+                    OperateResult.AppendText("<<SN" + sncode.Text + "校验成功\n", Color.Green, sncode);
+                    CheckCount = CheckCount + 1;
+                    CheckLabel.Text = CheckCount + "/" + dt.Rows.Count;
+                }
+                else
+                {
+                    OperateResult.AppendText("<<SN" + sncode.Text + "校验失败\n", Color.Red, sncode);
+                }
+                if (AllCheck)
+                {
+                    SetCheck set = new SetCheck("OK", Color.Green);
+                    BaseUtil.SetFormCenter(set);
+                    set.ShowDialog();
+                    pa_outboxcode.Focus();
+                }
+            }
+        }
+
+        private void pa_outboxcode_KeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.KeyCode == Keys.Enter)
+            {
+                dt = (DataTable)dh.ExecuteSql("select pa_outboxcode from package where pa_mothercode='" + pa_outboxcode.Text + "'", "select");
+                if (dt.Rows.Count > 0)
+                {
+                    CheckLabel.Text = CheckCount + "/" + dt.Rows.Count;
+                    BaseUtil.FillDgvWithDataTable(CheckSnDGV, dt);
+                    sncode.Focus();
+                }
+                else
+                {
+                    OperateResult.AppendText("<<箱号" + pa_outboxcode.Text + "不存在\n", Color.Red);
+                }
+                CheckCount = 0;
+            }
+        }
+
+        private void cancel_Click(object sender, EventArgs e)
+        {
+            CheckCount = 0;
+            dt = (DataTable)dh.ExecuteSql("select pa_outboxcode from package where pa_mothercode='" + pa_outboxcode.Text + "'", "select");
+            if (dt.Rows.Count > 0)
+            {
+                CheckLabel.Text = CheckCount + "/" + dt.Rows.Count;
+                BaseUtil.FillDgvWithDataTable(CheckSnDGV, dt);
+                sncode.Focus();
+            }
+            else
+            {
+                OperateResult.AppendText("<<箱号" + pa_outboxcode.Text + "不存在\n", Color.Red);
+            }
+            CheckCount = 0;
+        }
+    }
+}

+ 165 - 0
UAS_MES_LGDZ/FunctionCode/Make/Make_OutBoxSnCheck.resx

@@ -0,0 +1,165 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="pd_barcode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="pd_checksn.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="cancel.DownImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAFcSURBVFhH5di7UsJAFMbxtDT6QMI76IAFT0npIE0K
+        GcRORxHklpAIBHLfbILV8XxeNsMznJ35F5vu+82kWYuILD4N7oq75roCw27sb/x5WBdc27btntY64o/i
+        DnZjPxy4S6A0R6PHO1WUNHc9ep4uxIXd2D8eP/XZowWUThBG+n3p0stsKbbJ0qFDFFfscQuUbpzm9Pqx
+        Eh8c4PGLkuX0Nl+LDw4GJckUTRaO+OBQo+SKpitXfHAwKClfZuuN+OBgUDJV0NzxxAeHM5TFxhffGUpe
+        aFp5n+KDg0FRfHH8nfjgUKPoktztXnxwMCgFX7xdID441ChlRf7+ID44GBTNl21wFB8capSqot0xFB8c
+        /lE6Wa70IU5oH0Ziw/5cFebpoPUwHPbL04nCJKUgisWF3dgPB3gABc9v7fvBoBcnaVKdvkha2I39cPjx
+        oPrhusndcPinpIXd2N8gIusbTaFspKtR2SQAAAAASUVORK5CYII=
+</value>
+  </data>
+  <data name="cancel.MoveImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAFzSURBVFhH5djNSgJRGMZxL2P2gTfQFbZvHSEZFBEW
+        CEIQBEIgVFiS9qXWoDmp4/fHzDmjM2a+vU/QqUVX0DvwXxxn9fwYXJwYEcXWNzIWt83dcq7AsBv7LXgA
+        ZI0r71/aaqjCJf8o7sFu7IcDFwdK4vimrv1oSZXRnArdQFzYjf3pQkOzRxIoVWc6X5X6M7ruBGIr9mbU
+        9MIVe9hAcXvBO125WnxwgMcXSpcPF20tPjgYlI5eUK6lxAcHg9Lmw3nTFx8cDEpLLSjr+OKDg0FpqojO
+        Gp744GBQ3vyITutT8cHBoDheRCe1ifjgYFBe+ZCxJ+KDg0GpT0NKv4zFBweDUpuEdFQdiQ8OBsXmw2Fl
+        JD44/KCM53TwNBQfHAzKMx/2Hgfig8M3SrXYUasUfz67DwOxYf9dV5urg+RWzta4aEnxn83OfV9c2I39
+        cIAHUOJceTNbUfmW94GX0sJu7IcDPH5fXCe4EvfXxe5/D7ux3yKi2CfkPhTy27lqkwAAAABJRU5ErkJg
+        gg==
+</value>
+  </data>
+  <data name="cancel.NormalImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAGVSURBVFhH5di7agJRFIXhDSKoYBQEC8FCECwEQRBE
+        4uUVEtTiPKVlom2wttM6IfF+15njXHRnL19jD/zFmanWV8zAEDNTp9OJS6/Sm2QUht3YH4cHtdvtF6k7
+        mUwG1tqd3FR3YTf2w0FKUVOu6XT68Xgw3+8PtWH/bDYbCkeLGo1Gz/d9JwzvrL0gCKx49KlerxtIBUGo
+        PjjAg2q1mqDc2fN99cEBHlStVk0oB+t56oMDPKhSqZggDNm1N/XBAR5ULpeNvGD46rrqgwM8qFQqGV8O
+        56ujPjjAg4rFosFL5ni5qA8O8KBCoWBuns/701l9cIAH5fN5QfF4dzipDw7woFwuZ+zN483+oD44wIOy
+        2azB52i13asPDvCgTCZjHGt5sdmqDw7woHQ6bRzX8ny1UR8c4EHJZNJc5fC7XKsPDvCgRCLR2x9Pzt9q
+        zT+Lpdqw/3A6W/HoUywWa32Nx8OL4zwffM8X6sJu7IcDPCgajaak7udoNNjsdgc81BZ2Yz8c4PH8cR2J
+        ROJSU3qXjMKwG/vjzEz/skOI3Zqgv7AAAAAASUVORK5CYII=
+</value>
+  </data>
+</root>

+ 147 - 87
UAS_MES_LGDZ/FunctionCode/Make/Make_SMTStencil.Designer.cs

@@ -86,9 +86,10 @@
             // 
             this.ms_makecode_label.AutoSize = true;
             this.ms_makecode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ms_makecode_label.Location = new System.Drawing.Point(2, 9);
+            this.ms_makecode_label.Location = new System.Drawing.Point(4, 18);
+            this.ms_makecode_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.ms_makecode_label.Name = "ms_makecode_label";
-            this.ms_makecode_label.Size = new System.Drawing.Size(74, 21);
+            this.ms_makecode_label.Size = new System.Drawing.Size(146, 41);
             this.ms_makecode_label.TabIndex = 68;
             this.ms_makecode_label.Text = "归属工单";
             // 
@@ -96,9 +97,10 @@
             // 
             this.ma_prodcode_label.AutoSize = true;
             this.ma_prodcode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ma_prodcode_label.Location = new System.Drawing.Point(229, 9);
+            this.ma_prodcode_label.Location = new System.Drawing.Point(458, 18);
+            this.ma_prodcode_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.ma_prodcode_label.Name = "ma_prodcode_label";
-            this.ma_prodcode_label.Size = new System.Drawing.Size(74, 21);
+            this.ma_prodcode_label.Size = new System.Drawing.Size(146, 41);
             this.ma_prodcode_label.TabIndex = 69;
             this.ma_prodcode_label.Text = "产品编号";
             // 
@@ -106,9 +108,10 @@
             // 
             this.li_code_label.AutoSize = true;
             this.li_code_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.li_code_label.Location = new System.Drawing.Point(605, 494);
+            this.li_code_label.Location = new System.Drawing.Point(1210, 988);
+            this.li_code_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.li_code_label.Name = "li_code_label";
-            this.li_code_label.Size = new System.Drawing.Size(74, 21);
+            this.li_code_label.Size = new System.Drawing.Size(146, 41);
             this.li_code_label.TabIndex = 73;
             this.li_code_label.Text = "产线编号";
             // 
@@ -116,9 +119,10 @@
             // 
             this.RadioReceive.AutoSize = true;
             this.RadioReceive.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.RadioReceive.Location = new System.Drawing.Point(6, 494);
+            this.RadioReceive.Location = new System.Drawing.Point(12, 988);
+            this.RadioReceive.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.RadioReceive.Name = "RadioReceive";
-            this.RadioReceive.Size = new System.Drawing.Size(55, 24);
+            this.RadioReceive.Size = new System.Drawing.Size(102, 40);
             this.RadioReceive.TabIndex = 77;
             this.RadioReceive.TabStop = true;
             this.RadioReceive.Text = "领用";
@@ -129,9 +133,10 @@
             // 
             this.RadioReturn.AutoSize = true;
             this.RadioReturn.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.RadioReturn.Location = new System.Drawing.Point(6, 549);
+            this.RadioReturn.Location = new System.Drawing.Point(12, 1098);
+            this.RadioReturn.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.RadioReturn.Name = "RadioReturn";
-            this.RadioReturn.Size = new System.Drawing.Size(55, 24);
+            this.RadioReturn.Size = new System.Drawing.Size(102, 40);
             this.RadioReturn.TabIndex = 78;
             this.RadioReturn.TabStop = true;
             this.RadioReturn.Text = "退回";
@@ -142,9 +147,10 @@
             // 
             this.SU_DEVCODE_label.AutoSize = true;
             this.SU_DEVCODE_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.SU_DEVCODE_label.Location = new System.Drawing.Point(59, 494);
+            this.SU_DEVCODE_label.Location = new System.Drawing.Point(118, 988);
+            this.SU_DEVCODE_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.SU_DEVCODE_label.Name = "SU_DEVCODE_label";
-            this.SU_DEVCODE_label.Size = new System.Drawing.Size(74, 21);
+            this.SU_DEVCODE_label.Size = new System.Drawing.Size(146, 41);
             this.SU_DEVCODE_label.TabIndex = 81;
             this.SU_DEVCODE_label.Text = "钢网编号";
             // 
@@ -152,9 +158,10 @@
             // 
             this.st_table_label.AutoSize = true;
             this.st_table_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.st_table_label.Location = new System.Drawing.Point(266, 494);
+            this.st_table_label.Location = new System.Drawing.Point(532, 988);
+            this.st_table_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.st_table_label.Name = "st_table_label";
-            this.st_table_label.Size = new System.Drawing.Size(51, 21);
+            this.st_table_label.Size = new System.Drawing.Size(101, 41);
             this.st_table_label.TabIndex = 83;
             this.st_table_label.Text = "Table";
             // 
@@ -162,9 +169,10 @@
             // 
             this.SU_DEVCODE1_label.AutoSize = true;
             this.SU_DEVCODE1_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.SU_DEVCODE1_label.Location = new System.Drawing.Point(59, 552);
+            this.SU_DEVCODE1_label.Location = new System.Drawing.Point(118, 1104);
+            this.SU_DEVCODE1_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.SU_DEVCODE1_label.Name = "SU_DEVCODE1_label";
-            this.SU_DEVCODE1_label.Size = new System.Drawing.Size(74, 21);
+            this.SU_DEVCODE1_label.Size = new System.Drawing.Size(146, 41);
             this.SU_DEVCODE1_label.TabIndex = 87;
             this.SU_DEVCODE1_label.Text = "钢网编号";
             // 
@@ -172,9 +180,10 @@
             // 
             this.st_combinenumber_label.AutoSize = true;
             this.st_combinenumber_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.st_combinenumber_label.Location = new System.Drawing.Point(266, 552);
+            this.st_combinenumber_label.Location = new System.Drawing.Point(532, 1104);
+            this.st_combinenumber_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.st_combinenumber_label.Name = "st_combinenumber_label";
-            this.st_combinenumber_label.Size = new System.Drawing.Size(90, 21);
+            this.st_combinenumber_label.Size = new System.Drawing.Size(178, 41);
             this.st_combinenumber_label.TabIndex = 89;
             this.st_combinenumber_label.Text = "加工小板数";
             // 
@@ -182,9 +191,10 @@
             // 
             this.ma_qty_label.AutoSize = true;
             this.ma_qty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ma_qty_label.Location = new System.Drawing.Point(681, 9);
+            this.ma_qty_label.Location = new System.Drawing.Point(1362, 18);
+            this.ma_qty_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.ma_qty_label.Name = "ma_qty_label";
-            this.ma_qty_label.Size = new System.Drawing.Size(58, 21);
+            this.ma_qty_label.Size = new System.Drawing.Size(114, 41);
             this.ma_qty_label.TabIndex = 105;
             this.ma_qty_label.Text = "工单数";
             // 
@@ -192,18 +202,20 @@
             // 
             this.ma_qty.AutoSize = true;
             this.ma_qty.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ma_qty.Location = new System.Drawing.Point(755, 9);
+            this.ma_qty.Location = new System.Drawing.Point(1510, 18);
+            this.ma_qty.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.ma_qty.Name = "ma_qty";
-            this.ma_qty.Size = new System.Drawing.Size(0, 21);
+            this.ma_qty.Size = new System.Drawing.Size(0, 41);
             this.ma_qty.TabIndex = 106;
             // 
             // su_singlepringqty1_label
             // 
             this.su_singlepringqty1_label.AutoSize = true;
             this.su_singlepringqty1_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.su_singlepringqty1_label.Location = new System.Drawing.Point(447, 494);
+            this.su_singlepringqty1_label.Location = new System.Drawing.Point(894, 988);
+            this.su_singlepringqty1_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.su_singlepringqty1_label.Name = "su_singlepringqty1_label";
-            this.su_singlepringqty1_label.Size = new System.Drawing.Size(106, 21);
+            this.su_singlepringqty1_label.Size = new System.Drawing.Size(210, 41);
             this.su_singlepringqty1_label.TabIndex = 108;
             this.su_singlepringqty1_label.Text = "单片印刷次数";
             // 
@@ -211,9 +223,10 @@
             // 
             this.SU_RETURNIFCLEAN.AutoSize = true;
             this.SU_RETURNIFCLEAN.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.SU_RETURNIFCLEAN.Location = new System.Drawing.Point(692, 552);
+            this.SU_RETURNIFCLEAN.Location = new System.Drawing.Point(1384, 1104);
+            this.SU_RETURNIFCLEAN.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.SU_RETURNIFCLEAN.Name = "SU_RETURNIFCLEAN";
-            this.SU_RETURNIFCLEAN.Size = new System.Drawing.Size(84, 24);
+            this.SU_RETURNIFCLEAN.Size = new System.Drawing.Size(159, 40);
             this.SU_RETURNIFCLEAN.TabIndex = 110;
             this.SU_RETURNIFCLEAN.Text = "是否清洗";
             this.SU_RETURNIFCLEAN.UseVisualStyleBackColor = true;
@@ -222,9 +235,10 @@
             // 
             this.em_code_label.AutoSize = true;
             this.em_code_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.em_code_label.Location = new System.Drawing.Point(59, 524);
+            this.em_code_label.Location = new System.Drawing.Point(118, 1048);
+            this.em_code_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.em_code_label.Name = "em_code_label";
-            this.em_code_label.Size = new System.Drawing.Size(74, 21);
+            this.em_code_label.Size = new System.Drawing.Size(146, 41);
             this.em_code_label.TabIndex = 111;
             this.em_code_label.Text = "人员编号";
             // 
@@ -233,10 +247,11 @@
             this.em_code.AllPower = null;
             this.em_code.BackColor = System.Drawing.Color.White;
             this.em_code.ID = null;
-            this.em_code.Location = new System.Drawing.Point(139, 525);
+            this.em_code.Location = new System.Drawing.Point(278, 1050);
+            this.em_code.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.em_code.Name = "em_code";
             this.em_code.Power = null;
-            this.em_code.Size = new System.Drawing.Size(120, 21);
+            this.em_code.Size = new System.Drawing.Size(236, 35);
             this.em_code.Str = null;
             this.em_code.Str1 = null;
             this.em_code.Str2 = null;
@@ -247,11 +262,12 @@
             this.su_singlepringqty1.AllPower = null;
             this.su_singlepringqty1.BackColor = System.Drawing.Color.White;
             this.su_singlepringqty1.ID = null;
-            this.su_singlepringqty1.Location = new System.Drawing.Point(559, 496);
+            this.su_singlepringqty1.Location = new System.Drawing.Point(1118, 992);
+            this.su_singlepringqty1.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.su_singlepringqty1.Name = "su_singlepringqty1";
             this.su_singlepringqty1.Negative = false;
             this.su_singlepringqty1.Power = null;
-            this.su_singlepringqty1.Size = new System.Drawing.Size(39, 21);
+            this.su_singlepringqty1.Size = new System.Drawing.Size(74, 35);
             this.su_singlepringqty1.Str = null;
             this.su_singlepringqty1.Str1 = null;
             this.su_singlepringqty1.Str2 = null;
@@ -265,9 +281,10 @@
             this.st_table.Items.AddRange(new object[] {
             "BOTTOM",
             "TOP"});
-            this.st_table.Location = new System.Drawing.Point(322, 495);
+            this.st_table.Location = new System.Drawing.Point(644, 990);
+            this.st_table.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.st_table.Name = "st_table";
-            this.st_table.Size = new System.Drawing.Size(121, 20);
+            this.st_table.Size = new System.Drawing.Size(238, 32);
             this.st_table.TabIndex = 107;
             // 
             // Receive
@@ -277,12 +294,13 @@
             this.Receive.DownImage = ((System.Drawing.Image)(resources.GetObject("Receive.DownImage")));
             this.Receive.Image = null;
             this.Receive.IsShowBorder = true;
-            this.Receive.Location = new System.Drawing.Point(831, 489);
+            this.Receive.Location = new System.Drawing.Point(1662, 978);
+            this.Receive.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.Receive.MoveImage = ((System.Drawing.Image)(resources.GetObject("Receive.MoveImage")));
             this.Receive.Name = "Receive";
             this.Receive.NormalImage = ((System.Drawing.Image)(resources.GetObject("Receive.NormalImage")));
             this.Receive.Power = null;
-            this.Receive.Size = new System.Drawing.Size(68, 28);
+            this.Receive.Size = new System.Drawing.Size(136, 56);
             this.Receive.TabIndex = 104;
             this.Receive.Text = "领用";
             this.Receive.UseVisualStyleBackColor = false;
@@ -295,12 +313,13 @@
             this.Return.DownImage = ((System.Drawing.Image)(resources.GetObject("Return.DownImage")));
             this.Return.Image = null;
             this.Return.IsShowBorder = true;
-            this.Return.Location = new System.Drawing.Point(782, 548);
+            this.Return.Location = new System.Drawing.Point(1564, 1096);
+            this.Return.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.Return.MoveImage = ((System.Drawing.Image)(resources.GetObject("Return.MoveImage")));
             this.Return.Name = "Return";
             this.Return.NormalImage = ((System.Drawing.Image)(resources.GetObject("Return.NormalImage")));
             this.Return.Power = null;
-            this.Return.Size = new System.Drawing.Size(68, 28);
+            this.Return.Size = new System.Drawing.Size(136, 56);
             this.Return.TabIndex = 103;
             this.Return.Text = "退回";
             this.Return.UseVisualStyleBackColor = false;
@@ -311,10 +330,11 @@
             this.st_combinenumber.AllPower = null;
             this.st_combinenumber.BackColor = System.Drawing.Color.White;
             this.st_combinenumber.ID = null;
-            this.st_combinenumber.Location = new System.Drawing.Point(360, 553);
+            this.st_combinenumber.Location = new System.Drawing.Point(720, 1106);
+            this.st_combinenumber.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.st_combinenumber.Name = "st_combinenumber";
             this.st_combinenumber.Power = null;
-            this.st_combinenumber.Size = new System.Drawing.Size(120, 21);
+            this.st_combinenumber.Size = new System.Drawing.Size(236, 35);
             this.st_combinenumber.Str = null;
             this.st_combinenumber.Str1 = null;
             this.st_combinenumber.Str2 = null;
@@ -325,10 +345,11 @@
             this.SU_DEVCODE1.AllPower = null;
             this.SU_DEVCODE1.BackColor = System.Drawing.Color.White;
             this.SU_DEVCODE1.ID = null;
-            this.SU_DEVCODE1.Location = new System.Drawing.Point(139, 553);
+            this.SU_DEVCODE1.Location = new System.Drawing.Point(278, 1106);
+            this.SU_DEVCODE1.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.SU_DEVCODE1.Name = "SU_DEVCODE1";
             this.SU_DEVCODE1.Power = null;
-            this.SU_DEVCODE1.Size = new System.Drawing.Size(120, 21);
+            this.SU_DEVCODE1.Size = new System.Drawing.Size(236, 35);
             this.SU_DEVCODE1.Str = null;
             this.SU_DEVCODE1.Str1 = null;
             this.SU_DEVCODE1.Str2 = null;
@@ -340,10 +361,11 @@
             this.SU_DEVCODE.AllPower = null;
             this.SU_DEVCODE.BackColor = System.Drawing.Color.White;
             this.SU_DEVCODE.ID = null;
-            this.SU_DEVCODE.Location = new System.Drawing.Point(139, 495);
+            this.SU_DEVCODE.Location = new System.Drawing.Point(278, 990);
+            this.SU_DEVCODE.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.SU_DEVCODE.Name = "SU_DEVCODE";
             this.SU_DEVCODE.Power = null;
-            this.SU_DEVCODE.Size = new System.Drawing.Size(120, 21);
+            this.SU_DEVCODE.Size = new System.Drawing.Size(236, 35);
             this.SU_DEVCODE.Str = null;
             this.SU_DEVCODE.Str1 = null;
             this.SU_DEVCODE.Str2 = null;
@@ -364,61 +386,78 @@
             this.su_table,
             this.su_usemacode});
             this.ToolsBom.EnableContentClick = true;
-            this.ToolsBom.Location = new System.Drawing.Point(0, 38);
+            this.ToolsBom.Location = new System.Drawing.Point(0, 76);
+            this.ToolsBom.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.ToolsBom.Name = "ToolsBom";
+            this.ToolsBom.RowHeadersWidth = 82;
             this.ToolsBom.RowTemplate.Height = 27;
-            this.ToolsBom.Size = new System.Drawing.Size(906, 447);
+            this.ToolsBom.Size = new System.Drawing.Size(1812, 894);
             this.ToolsBom.TabIndex = 76;
             // 
             // su_stcode
             // 
             this.su_stcode.DataPropertyName = "su_stcode";
             this.su_stcode.HeaderText = "钢网编号";
+            this.su_stcode.MinimumWidth = 10;
             this.su_stcode.Name = "su_stcode";
+            this.su_stcode.Width = 200;
             // 
             // st_pcbcode
             // 
             this.st_pcbcode.DataPropertyName = "st_pcbcode";
             this.st_pcbcode.HeaderText = "PCB料号";
+            this.st_pcbcode.MinimumWidth = 10;
             this.st_pcbcode.Name = "st_pcbcode";
+            this.st_pcbcode.Width = 200;
             // 
             // su_status
             // 
             this.su_status.DataPropertyName = "su_status";
             this.su_status.HeaderText = "领用状态";
+            this.su_status.MinimumWidth = 10;
             this.su_status.Name = "su_status";
+            this.su_status.Width = 200;
             // 
             // SU_LINECODE
             // 
             this.SU_LINECODE.DataPropertyName = "SU_LINECODE";
             this.SU_LINECODE.HeaderText = "线别";
+            this.SU_LINECODE.MinimumWidth = 10;
             this.SU_LINECODE.Name = "SU_LINECODE";
+            this.SU_LINECODE.Width = 200;
             // 
             // su_stverison
             // 
             this.su_stverison.DataPropertyName = "su_stverison";
             this.su_stverison.HeaderText = "版本号";
+            this.su_stverison.MinimumWidth = 10;
             this.su_stverison.Name = "su_stverison";
+            this.su_stverison.Width = 200;
             // 
             // su_singlepringqty
             // 
             this.su_singlepringqty.DataPropertyName = "su_singlepringqty";
             this.su_singlepringqty.HeaderText = "单片印刷次数";
+            this.su_singlepringqty.MinimumWidth = 10;
             this.su_singlepringqty.Name = "su_singlepringqty";
+            this.su_singlepringqty.Width = 200;
             // 
             // su_table
             // 
             this.su_table.DataPropertyName = "su_table";
             this.su_table.HeaderText = "板面";
+            this.su_table.MinimumWidth = 10;
             this.su_table.Name = "su_table";
+            this.su_table.Width = 200;
             // 
             // su_usemacode
             // 
             this.su_usemacode.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCells;
             this.su_usemacode.DataPropertyName = "su_usemacode";
             this.su_usemacode.HeaderText = "领用工单";
+            this.su_usemacode.MinimumWidth = 10;
             this.su_usemacode.Name = "su_usemacode";
-            this.su_usemacode.Width = 61;
+            this.su_usemacode.Width = 118;
             // 
             // Confirm
             // 
@@ -427,12 +466,13 @@
             this.Confirm.DownImage = ((System.Drawing.Image)(resources.GetObject("Confirm.DownImage")));
             this.Confirm.Image = null;
             this.Confirm.IsShowBorder = true;
-            this.Confirm.Location = new System.Drawing.Point(828, 4);
+            this.Confirm.Location = new System.Drawing.Point(1656, 8);
+            this.Confirm.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.Confirm.MoveImage = ((System.Drawing.Image)(resources.GetObject("Confirm.MoveImage")));
             this.Confirm.Name = "Confirm";
             this.Confirm.NormalImage = ((System.Drawing.Image)(resources.GetObject("Confirm.NormalImage")));
             this.Confirm.Power = null;
-            this.Confirm.Size = new System.Drawing.Size(68, 28);
+            this.Confirm.Size = new System.Drawing.Size(136, 56);
             this.Confirm.TabIndex = 75;
             this.Confirm.Text = "确定";
             this.Confirm.UseVisualStyleBackColor = false;
@@ -446,13 +486,14 @@
             this.li_code.Condition = null;
             this.li_code.DBTitle = null;
             this.li_code.FormName = null;
-            this.li_code.Location = new System.Drawing.Point(685, 494);
+            this.li_code.Location = new System.Drawing.Point(1370, 988);
+            this.li_code.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.li_code.Name = "li_code";
             this.li_code.Power = null;
             this.li_code.ReturnData = null;
             this.li_code.SelectField = null;
             this.li_code.SetValueField = null;
-            this.li_code.Size = new System.Drawing.Size(127, 21);
+            this.li_code.Size = new System.Drawing.Size(254, 42);
             this.li_code.TabIndex = 74;
             this.li_code.TableName = null;
             this.li_code.TextBoxEnable = false;
@@ -463,10 +504,11 @@
             this.ma_prodcode.BackColor = System.Drawing.Color.White;
             this.ma_prodcode.Enabled = false;
             this.ma_prodcode.ID = null;
-            this.ma_prodcode.Location = new System.Drawing.Point(309, 9);
+            this.ma_prodcode.Location = new System.Drawing.Point(618, 18);
+            this.ma_prodcode.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.ma_prodcode.Name = "ma_prodcode";
             this.ma_prodcode.Power = null;
-            this.ma_prodcode.Size = new System.Drawing.Size(140, 21);
+            this.ma_prodcode.Size = new System.Drawing.Size(276, 35);
             this.ma_prodcode.Str = null;
             this.ma_prodcode.Str1 = null;
             this.ma_prodcode.Str2 = null;
@@ -479,13 +521,14 @@
             this.ma_code.Condition = null;
             this.ma_code.DBTitle = null;
             this.ma_code.FormName = null;
-            this.ma_code.Location = new System.Drawing.Point(82, 9);
+            this.ma_code.Location = new System.Drawing.Point(164, 18);
+            this.ma_code.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.ma_code.Name = "ma_code";
             this.ma_code.Power = null;
             this.ma_code.ReturnData = null;
             this.ma_code.SelectField = null;
             this.ma_code.SetValueField = null;
-            this.ma_code.Size = new System.Drawing.Size(141, 21);
+            this.ma_code.Size = new System.Drawing.Size(282, 42);
             this.ma_code.TabIndex = 71;
             this.ma_code.TableName = null;
             this.ma_code.Tag = "ma_code";
@@ -497,10 +540,11 @@
             this.em_code1.AllPower = null;
             this.em_code1.BackColor = System.Drawing.Color.White;
             this.em_code1.ID = null;
-            this.em_code1.Location = new System.Drawing.Point(566, 553);
+            this.em_code1.Location = new System.Drawing.Point(1132, 1106);
+            this.em_code1.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.em_code1.Name = "em_code1";
             this.em_code1.Power = null;
-            this.em_code1.Size = new System.Drawing.Size(120, 21);
+            this.em_code1.Size = new System.Drawing.Size(236, 35);
             this.em_code1.Str = null;
             this.em_code1.Str1 = null;
             this.em_code1.Str2 = null;
@@ -510,9 +554,10 @@
             // 
             this.em_code1_label.AutoSize = true;
             this.em_code1_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.em_code1_label.Location = new System.Drawing.Point(486, 552);
+            this.em_code1_label.Location = new System.Drawing.Point(972, 1104);
+            this.em_code1_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.em_code1_label.Name = "em_code1_label";
-            this.em_code1_label.Size = new System.Drawing.Size(74, 21);
+            this.em_code1_label.Size = new System.Drawing.Size(146, 41);
             this.em_code1_label.TabIndex = 113;
             this.em_code1_label.Text = "人员编号";
             // 
@@ -521,11 +566,12 @@
             this.ST_ENSIONA.AllPower = null;
             this.ST_ENSIONA.BackColor = System.Drawing.Color.White;
             this.ST_ENSIONA.ID = null;
-            this.ST_ENSIONA.Location = new System.Drawing.Point(165, 592);
+            this.ST_ENSIONA.Location = new System.Drawing.Point(330, 1184);
+            this.ST_ENSIONA.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.ST_ENSIONA.Name = "ST_ENSIONA";
             this.ST_ENSIONA.Negative = false;
             this.ST_ENSIONA.Power = null;
-            this.ST_ENSIONA.Size = new System.Drawing.Size(120, 21);
+            this.ST_ENSIONA.Size = new System.Drawing.Size(236, 35);
             this.ST_ENSIONA.Str = null;
             this.ST_ENSIONA.Str1 = null;
             this.ST_ENSIONA.Str2 = null;
@@ -535,9 +581,10 @@
             // 
             this.ST_ENSIONA_label.AutoSize = true;
             this.ST_ENSIONA_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ST_ENSIONA_label.Location = new System.Drawing.Point(138, 592);
+            this.ST_ENSIONA_label.Location = new System.Drawing.Point(276, 1184);
+            this.ST_ENSIONA_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.ST_ENSIONA_label.Name = "ST_ENSIONA_label";
-            this.ST_ENSIONA_label.Size = new System.Drawing.Size(21, 21);
+            this.ST_ENSIONA_label.Size = new System.Drawing.Size(41, 41);
             this.ST_ENSIONA_label.TabIndex = 124;
             this.ST_ENSIONA_label.Text = "A";
             // 
@@ -546,11 +593,12 @@
             this.ST_ENSIONB.AllPower = null;
             this.ST_ENSIONB.BackColor = System.Drawing.Color.White;
             this.ST_ENSIONB.ID = null;
-            this.ST_ENSIONB.Location = new System.Drawing.Point(360, 592);
+            this.ST_ENSIONB.Location = new System.Drawing.Point(720, 1184);
+            this.ST_ENSIONB.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.ST_ENSIONB.Name = "ST_ENSIONB";
             this.ST_ENSIONB.Negative = false;
             this.ST_ENSIONB.Power = null;
-            this.ST_ENSIONB.Size = new System.Drawing.Size(120, 21);
+            this.ST_ENSIONB.Size = new System.Drawing.Size(236, 35);
             this.ST_ENSIONB.Str = null;
             this.ST_ENSIONB.Str1 = null;
             this.ST_ENSIONB.Str2 = null;
@@ -560,9 +608,10 @@
             // 
             this.ST_ENSIONB_label.AutoSize = true;
             this.ST_ENSIONB_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ST_ENSIONB_label.Location = new System.Drawing.Point(333, 592);
+            this.ST_ENSIONB_label.Location = new System.Drawing.Point(666, 1184);
+            this.ST_ENSIONB_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.ST_ENSIONB_label.Name = "ST_ENSIONB_label";
-            this.ST_ENSIONB_label.Size = new System.Drawing.Size(20, 21);
+            this.ST_ENSIONB_label.Size = new System.Drawing.Size(38, 41);
             this.ST_ENSIONB_label.TabIndex = 122;
             this.ST_ENSIONB_label.Text = "B";
             // 
@@ -571,11 +620,12 @@
             this.ST_ENSIONC.AllPower = null;
             this.ST_ENSIONC.BackColor = System.Drawing.Color.White;
             this.ST_ENSIONC.ID = null;
-            this.ST_ENSIONC.Location = new System.Drawing.Point(559, 592);
+            this.ST_ENSIONC.Location = new System.Drawing.Point(1118, 1184);
+            this.ST_ENSIONC.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.ST_ENSIONC.Name = "ST_ENSIONC";
             this.ST_ENSIONC.Negative = false;
             this.ST_ENSIONC.Power = null;
-            this.ST_ENSIONC.Size = new System.Drawing.Size(120, 21);
+            this.ST_ENSIONC.Size = new System.Drawing.Size(236, 35);
             this.ST_ENSIONC.Str = null;
             this.ST_ENSIONC.Str1 = null;
             this.ST_ENSIONC.Str2 = null;
@@ -585,9 +635,10 @@
             // 
             this.ST_ENSIONC_label.AutoSize = true;
             this.ST_ENSIONC_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ST_ENSIONC_label.Location = new System.Drawing.Point(532, 592);
+            this.ST_ENSIONC_label.Location = new System.Drawing.Point(1064, 1184);
+            this.ST_ENSIONC_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.ST_ENSIONC_label.Name = "ST_ENSIONC_label";
-            this.ST_ENSIONC_label.Size = new System.Drawing.Size(21, 21);
+            this.ST_ENSIONC_label.Size = new System.Drawing.Size(39, 41);
             this.ST_ENSIONC_label.TabIndex = 120;
             this.ST_ENSIONC_label.Text = "C";
             // 
@@ -596,11 +647,12 @@
             this.ST_ENSIOND.AllPower = null;
             this.ST_ENSIOND.BackColor = System.Drawing.Color.White;
             this.ST_ENSIOND.ID = null;
-            this.ST_ENSIOND.Location = new System.Drawing.Point(165, 619);
+            this.ST_ENSIOND.Location = new System.Drawing.Point(330, 1238);
+            this.ST_ENSIOND.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.ST_ENSIOND.Name = "ST_ENSIOND";
             this.ST_ENSIOND.Negative = false;
             this.ST_ENSIOND.Power = null;
-            this.ST_ENSIOND.Size = new System.Drawing.Size(120, 21);
+            this.ST_ENSIOND.Size = new System.Drawing.Size(236, 35);
             this.ST_ENSIOND.Str = null;
             this.ST_ENSIOND.Str1 = null;
             this.ST_ENSIOND.Str2 = null;
@@ -610,9 +662,10 @@
             // 
             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(138, 619);
+            this.label9.Location = new System.Drawing.Point(276, 1238);
+            this.label9.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label9.Name = "label9";
-            this.label9.Size = new System.Drawing.Size(22, 21);
+            this.label9.Size = new System.Drawing.Size(42, 41);
             this.label9.TabIndex = 118;
             this.label9.Text = "D";
             // 
@@ -621,11 +674,12 @@
             this.ST_ENSIONE.AllPower = null;
             this.ST_ENSIONE.BackColor = System.Drawing.Color.White;
             this.ST_ENSIONE.ID = null;
-            this.ST_ENSIONE.Location = new System.Drawing.Point(360, 619);
+            this.ST_ENSIONE.Location = new System.Drawing.Point(720, 1238);
+            this.ST_ENSIONE.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.ST_ENSIONE.Name = "ST_ENSIONE";
             this.ST_ENSIONE.Negative = false;
             this.ST_ENSIONE.Power = null;
-            this.ST_ENSIONE.Size = new System.Drawing.Size(120, 21);
+            this.ST_ENSIONE.Size = new System.Drawing.Size(236, 35);
             this.ST_ENSIONE.Str = null;
             this.ST_ENSIONE.Str1 = null;
             this.ST_ENSIONE.Str2 = null;
@@ -635,9 +689,10 @@
             // 
             this.ST_ENSIONE_label.AutoSize = true;
             this.ST_ENSIONE_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ST_ENSIONE_label.Location = new System.Drawing.Point(334, 619);
+            this.ST_ENSIONE_label.Location = new System.Drawing.Point(668, 1238);
+            this.ST_ENSIONE_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.ST_ENSIONE_label.Name = "ST_ENSIONE_label";
-            this.ST_ENSIONE_label.Size = new System.Drawing.Size(19, 21);
+            this.ST_ENSIONE_label.Size = new System.Drawing.Size(36, 41);
             this.ST_ENSIONE_label.TabIndex = 116;
             this.ST_ENSIONE_label.Text = "E";
             // 
@@ -645,9 +700,10 @@
             // 
             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(7, 592);
+            this.label7.Location = new System.Drawing.Point(14, 1184);
+            this.label7.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label7.Name = "label7";
-            this.label7.Size = new System.Drawing.Size(129, 21);
+            this.label7.Size = new System.Drawing.Size(258, 41);
             this.label7.TabIndex = 115;
             this.label7.Text = "张力测试结果(N)";
             // 
@@ -658,30 +714,33 @@
             this.Scrap.DownImage = ((System.Drawing.Image)(resources.GetObject("Scrap.DownImage")));
             this.Scrap.Image = null;
             this.Scrap.IsShowBorder = true;
-            this.Scrap.Location = new System.Drawing.Point(782, 614);
+            this.Scrap.Location = new System.Drawing.Point(1564, 1228);
+            this.Scrap.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.Scrap.MoveImage = ((System.Drawing.Image)(resources.GetObject("Scrap.MoveImage")));
             this.Scrap.Name = "Scrap";
             this.Scrap.NormalImage = ((System.Drawing.Image)(resources.GetObject("Scrap.NormalImage")));
             this.Scrap.Power = null;
-            this.Scrap.Size = new System.Drawing.Size(68, 28);
+            this.Scrap.Size = new System.Drawing.Size(136, 56);
             this.Scrap.TabIndex = 126;
             this.Scrap.Text = "报废";
             this.Scrap.UseVisualStyleBackColor = false;
+            this.Scrap.Click += new System.EventHandler(this.Scrap_Click);
             // 
             // st_usecount
             // 
             this.st_usecount.AutoSize = true;
-            this.st_usecount.Location = new System.Drawing.Point(336, 528);
+            this.st_usecount.Location = new System.Drawing.Point(672, 1056);
+            this.st_usecount.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.st_usecount.Name = "st_usecount";
-            this.st_usecount.Size = new System.Drawing.Size(0, 12);
+            this.st_usecount.Size = new System.Drawing.Size(0, 24);
             this.st_usecount.TabIndex = 127;
             this.st_usecount.Visible = false;
             // 
             // Make_SMTStencil
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 24F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(908, 655);
+            this.ClientSize = new System.Drawing.Size(1816, 1310);
             this.Controls.Add(this.st_usecount);
             this.Controls.Add(this.Scrap);
             this.Controls.Add(this.ST_ENSIONA);
@@ -725,6 +784,7 @@
             this.Controls.Add(this.ms_makecode_label);
             this.Controls.Add(this.ma_prodcode_label);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
+            this.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.Name = "Make_SMTStencil";
             this.Tag = "Make!SMTStencil";
             this.Text = "Make_SMTStencil";

+ 7 - 2
UAS_MES_LGDZ/FunctionCode/Make/Make_SMTStencil.cs

@@ -150,8 +150,13 @@ namespace UAS_MES_NEW.Make
             dt = (DataTable)dh.ExecuteSql("select 1 from STENILCANUSEPRO where sp_stcode='" + SU_DEVCODE.Text + "' and sp_prodcode='" + ma_prodcode.Text + "'", "select");
             if (dt.Rows.Count == 0)
             {
-                MessageBox.Show("钢网编号" + SU_DEVCODE.Text + "不能在产品" + ma_prodcode.Text + "中使用");
-                return;
+                dt = (DataTable)dh.ExecuteSql("select 1 from makematerial where mm_code='" + ma_code.Text + "' and mm_prodcode in (select SP_PRODCODE from " +
+                    "STENILCANUSEPRO where SP_STCODE='" + SU_DEVCODE.Text + "')", "select");
+                if (dt.Rows.Count == 0)
+                {
+                    MessageBox.Show("钢网编号" + SU_DEVCODE.Text + "不能在产品" + ma_prodcode.Text + "中使用");
+                    return;
+                }
             }
             //一条线只能在线一个钢网
             dt = (DataTable)dh.ExecuteSql("select su_stcode from stenciluse where su_linecode='" + li_code.Text + "' and su_status='在线'", "select");

+ 115 - 45
UAS_MES_LGDZ/FunctionCode/Packing/Packing_PackageCollectionWeigh.Designer.cs

@@ -112,6 +112,11 @@
             this.AllowRepeat = new System.Windows.Forms.CheckBox();
             this.label6 = new System.Windows.Forms.Label();
             this.Remark_PreFix = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.SnCollectionBox();
+            this.PrintLabel1 = new UAS_MES_NEW.CustomControl.ComBoxWithFocus.ComboxWithTip(this.components);
+            this.label7 = new System.Windows.Forms.Label();
+            this.PrintList1 = new UAS_MES_NEW.CustomControl.ComBoxWithFocus.PrinterCombox();
+            this.label8 = new System.Windows.Forms.Label();
+            this.PrintSecond = new System.Windows.Forms.CheckBox();
             ((System.ComponentModel.ISupportInitialize)(this.PackageDetail)).BeginInit();
             this.groupBoxWithBorder1.SuspendLayout();
             this.groupBoxWithBorder2.SuspendLayout();
@@ -122,7 +127,7 @@
             // 
             this.pa_makecode.AutoSize = true;
             this.pa_makecode.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pa_makecode.Location = new System.Drawing.Point(1662, 858);
+            this.pa_makecode.Location = new System.Drawing.Point(1662, 877);
             this.pa_makecode.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.pa_makecode.Name = "pa_makecode";
             this.pa_makecode.Size = new System.Drawing.Size(0, 41);
@@ -145,7 +150,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(7, 89);
+            this.pa_code_label.Location = new System.Drawing.Point(9, 91);
             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);
@@ -156,7 +161,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(11, 103);
+            this.PrintList_label.Location = new System.Drawing.Point(13, 105);
             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);
@@ -167,7 +172,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(381, 255);
+            this.PrintNum_label.Location = new System.Drawing.Point(383, 257);
             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);
@@ -190,7 +195,7 @@
             // 
             this.pa_id.AutoSize = true;
             this.pa_id.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pa_id.Location = new System.Drawing.Point(1598, 858);
+            this.pa_id.Location = new System.Drawing.Point(1598, 877);
             this.pa_id.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.pa_id.Name = "pa_id";
             this.pa_id.Size = new System.Drawing.Size(0, 41);
@@ -213,7 +218,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(11, 179);
+            this.label3.Location = new System.Drawing.Point(13, 181);
             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);
@@ -401,10 +406,10 @@
             // AutoPrint
             // 
             this.AutoPrint.Checked = false;
-            this.AutoPrint.Location = new System.Drawing.Point(156, 258);
-            this.AutoPrint.Margin = new System.Windows.Forms.Padding(6, 8, 6, 8);
+            this.AutoPrint.Location = new System.Drawing.Point(157, 258);
+            this.AutoPrint.Margin = new System.Windows.Forms.Padding(6, 9, 6, 9);
             this.AutoPrint.Name = "AutoPrint";
-            this.AutoPrint.Size = new System.Drawing.Size(178, 44);
+            this.AutoPrint.Size = new System.Drawing.Size(177, 44);
             this.AutoPrint.TabIndex = 166;
             // 
             // groupBoxWithBorder1
@@ -446,7 +451,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(351, 25);
+            this.PreFix_label.Location = new System.Drawing.Point(353, 27);
             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);
@@ -477,7 +482,7 @@
             this.locksalecode.CheckState = System.Windows.Forms.CheckState.Checked;
             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(595, 29);
+            this.locksalecode.Location = new System.Drawing.Point(597, 31);
             this.locksalecode.Margin = new System.Windows.Forms.Padding(6);
             this.locksalecode.Name = "locksalecode";
             this.locksalecode.Size = new System.Drawing.Size(186, 28);
@@ -489,7 +494,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(419, 271);
+            this.label5.Location = new System.Drawing.Point(421, 273);
             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);
@@ -500,7 +505,7 @@
             // 
             this.ms_makecode_label.AutoSize = true;
             this.ms_makecode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ms_makecode_label.Location = new System.Drawing.Point(7, 271);
+            this.ms_makecode_label.Location = new System.Drawing.Point(9, 273);
             this.ms_makecode_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.ms_makecode_label.Name = "ms_makecode_label";
             this.ms_makecode_label.Size = new System.Drawing.Size(114, 41);
@@ -511,7 +516,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(587, 271);
+            this.ms_salecode.Location = new System.Drawing.Point(589, 273);
             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);
@@ -521,7 +526,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(169, 271);
+            this.ms_makecode.Location = new System.Drawing.Point(171, 273);
             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";
@@ -532,7 +537,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(169, 25);
+            this.OutBoxLength_label.Location = new System.Drawing.Point(171, 27);
             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);
@@ -597,7 +602,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(419, 155);
+            this.pa_currentqty_label.Location = new System.Drawing.Point(421, 157);
             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);
@@ -608,7 +613,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, 211);
+            this.pr_detail_label.Location = new System.Drawing.Point(421, 213);
             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);
@@ -619,7 +624,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(587, 155);
+            this.pa_currentqty.Location = new System.Drawing.Point(589, 157);
             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);
@@ -629,7 +634,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(7, 213);
+            this.pr_code_label.Location = new System.Drawing.Point(9, 215);
             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);
@@ -640,7 +645,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(587, 211);
+            this.pr_detail.Location = new System.Drawing.Point(589, 213);
             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);
@@ -650,7 +655,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(7, 147);
+            this.pr_outboxinnerqty_label.Location = new System.Drawing.Point(9, 149);
             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);
@@ -661,7 +666,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(169, 213);
+            this.pr_code.Location = new System.Drawing.Point(171, 215);
             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";
@@ -672,7 +677,7 @@
             // AutoGenBoxCode
             // 
             this.AutoGenBoxCode.AutoSize = true;
-            this.AutoGenBoxCode.Location = new System.Drawing.Point(483, 91);
+            this.AutoGenBoxCode.Location = new System.Drawing.Point(485, 93);
             this.AutoGenBoxCode.Margin = new System.Windows.Forms.Padding(4);
             this.AutoGenBoxCode.Name = "AutoGenBoxCode";
             this.AutoGenBoxCode.Size = new System.Drawing.Size(178, 45);
@@ -685,7 +690,7 @@
             // 
             this.StepCount.LineCode = null;
             this.StepCount.Location = new System.Drawing.Point(222, 38);
-            this.StepCount.Margin = new System.Windows.Forms.Padding(6, 8, 6, 8);
+            this.StepCount.Margin = new System.Windows.Forms.Padding(6, 9, 6, 9);
             this.StepCount.Name = "StepCount";
             this.StepCount.Size = new System.Drawing.Size(176, 46);
             this.StepCount.Source = null;
@@ -745,7 +750,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(537, 43);
+            this.label1.Location = new System.Drawing.Point(539, 45);
             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);
@@ -757,7 +762,7 @@
             this.checkweightlabel.AutoSize = true;
             this.checkweightlabel.CutLength = null;
             this.checkweightlabel.ForeColor = System.Drawing.Color.Black;
-            this.checkweightlabel.Location = new System.Drawing.Point(29, 41);
+            this.checkweightlabel.Location = new System.Drawing.Point(31, 43);
             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";
@@ -768,7 +773,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(699, 183);
+            this.ob_nowcheckqty.Location = new System.Drawing.Point(701, 185);
             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);
@@ -778,7 +783,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(699, 111);
+            this.ob_batchqty.Location = new System.Drawing.Point(701, 113);
             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);
@@ -788,7 +793,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(537, 183);
+            this.ob_nowcheckqty_label.Location = new System.Drawing.Point(539, 185);
             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);
@@ -799,7 +804,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(537, 111);
+            this.ob_batchqty_label.Location = new System.Drawing.Point(539, 113);
             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);
@@ -851,7 +856,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(699, 43);
+            this.ob_checkno.Location = new System.Drawing.Point(701, 45);
             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);
@@ -862,7 +867,7 @@
             // 
             this.pr_packrule.AutoSize = true;
             this.pr_packrule.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_packrule.Location = new System.Drawing.Point(1698, 908);
+            this.pr_packrule.Location = new System.Drawing.Point(1698, 927);
             this.pr_packrule.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.pr_packrule.Name = "pr_packrule";
             this.pr_packrule.Size = new System.Drawing.Size(0, 41);
@@ -873,7 +878,7 @@
             // 
             this.pa_status.AutoSize = true;
             this.pa_status.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pa_status.Location = new System.Drawing.Point(1554, 858);
+            this.pa_status.Location = new System.Drawing.Point(1554, 877);
             this.pa_status.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.pa_status.Name = "pa_status";
             this.pa_status.Size = new System.Drawing.Size(0, 41);
@@ -926,7 +931,7 @@
             // 
             this.pr_cartonunit1.AutoSize = true;
             this.pr_cartonunit1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_cartonunit1.Location = new System.Drawing.Point(153, 243);
+            this.pr_cartonunit1.Location = new System.Drawing.Point(155, 245);
             this.pr_cartonunit1.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.pr_cartonunit1.Name = "pr_cartonunit1";
             this.pr_cartonunit1.Size = new System.Drawing.Size(38, 41);
@@ -939,7 +944,7 @@
             // 
             this.pr_cartonunit.AutoSize = true;
             this.pr_cartonunit.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_cartonunit.Location = new System.Drawing.Point(91, 37);
+            this.pr_cartonunit.Location = new System.Drawing.Point(93, 39);
             this.pr_cartonunit.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.pr_cartonunit.Name = "pr_cartonunit";
             this.pr_cartonunit.Size = new System.Drawing.Size(38, 41);
@@ -951,7 +956,7 @@
             // 
             this.pr_cartonboxgw.AutoSize = true;
             this.pr_cartonboxgw.Font = new System.Drawing.Font("微软雅黑", 25F);
-            this.pr_cartonboxgw.Location = new System.Drawing.Point(23, 317);
+            this.pr_cartonboxgw.Location = new System.Drawing.Point(25, 319);
             this.pr_cartonboxgw.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.pr_cartonboxgw.Name = "pr_cartonboxgw";
             this.pr_cartonboxgw.Size = new System.Drawing.Size(0, 88);
@@ -961,7 +966,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(7, 243);
+            this.label4.Location = new System.Drawing.Point(9, 245);
             this.label4.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label4.Name = "label4";
             this.label4.Size = new System.Drawing.Size(146, 41);
@@ -973,7 +978,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(19, 105);
+            this.weight.Location = new System.Drawing.Point(21, 107);
             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);
@@ -983,7 +988,7 @@
             // 
             this.label2.AutoSize = true;
             this.label2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label2.Location = new System.Drawing.Point(7, 37);
+            this.label2.Location = new System.Drawing.Point(9, 39);
             this.label2.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label2.Name = "label2";
             this.label2.Size = new System.Drawing.Size(82, 41);
@@ -994,7 +999,7 @@
             // 
             this.Baurate.AutoSize = true;
             this.Baurate.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.Baurate.Location = new System.Drawing.Point(1454, 858);
+            this.Baurate.Location = new System.Drawing.Point(1454, 877);
             this.Baurate.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.Baurate.Name = "Baurate";
             this.Baurate.Size = new System.Drawing.Size(0, 41);
@@ -1005,7 +1010,7 @@
             // 
             this.ComList.AutoSize = true;
             this.ComList.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ComList.Location = new System.Drawing.Point(1484, 858);
+            this.ComList.Location = new System.Drawing.Point(1484, 877);
             this.ComList.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.ComList.Name = "ComList";
             this.ComList.Size = new System.Drawing.Size(0, 41);
@@ -1016,7 +1021,7 @@
             // 
             this.pa_downstatus.AutoSize = true;
             this.pa_downstatus.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pa_downstatus.Location = new System.Drawing.Point(1662, 908);
+            this.pa_downstatus.Location = new System.Drawing.Point(1662, 927);
             this.pa_downstatus.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.pa_downstatus.Name = "pa_downstatus";
             this.pa_downstatus.Size = new System.Drawing.Size(0, 41);
@@ -1038,7 +1043,7 @@
             // 
             this.pa_sccode.AutoSize = true;
             this.pa_sccode.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pa_sccode.Location = new System.Drawing.Point(1650, 908);
+            this.pa_sccode.Location = new System.Drawing.Point(1650, 927);
             this.pa_sccode.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.pa_sccode.Name = "pa_sccode";
             this.pa_sccode.Size = new System.Drawing.Size(0, 41);
@@ -1060,7 +1065,7 @@
             // 
             this.pr_sendchecktype.AutoSize = true;
             this.pr_sendchecktype.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_sendchecktype.Location = new System.Drawing.Point(1252, 872);
+            this.pr_sendchecktype.Location = new System.Drawing.Point(1252, 891);
             this.pr_sendchecktype.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.pr_sendchecktype.Name = "pr_sendchecktype";
             this.pr_sendchecktype.Size = new System.Drawing.Size(0, 41);
@@ -1187,13 +1192,73 @@
             this.Remark_PreFix.TabIndex = 211;
             this.Remark_PreFix.KeyDown += new System.Windows.Forms.KeyEventHandler(this.Remark_PreFix_KeyDown);
             // 
+            // 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(1400, 965);
+            this.PrintLabel1.Margin = new System.Windows.Forms.Padding(4);
+            this.PrintLabel1.Name = "PrintLabel1";
+            this.PrintLabel1.Size = new System.Drawing.Size(296, 39);
+            this.PrintLabel1.TabIndex = 195;
+            // 
+            // label7
+            // 
+            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(1192, 963);
+            this.label7.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+            this.label7.Name = "label7";
+            this.label7.Size = new System.Drawing.Size(165, 41);
+            this.label7.TabIndex = 196;
+            this.label7.Text = "打印标签1";
+            // 
+            // PrintList1
+            // 
+            this.PrintList1.Font = new System.Drawing.Font("微软雅黑", 9F);
+            this.PrintList1.Location = new System.Drawing.Point(1400, 912);
+            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 = 194;
+            // 
+            // label8
+            // 
+            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(1192, 908);
+            this.label8.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+            this.label8.Name = "label8";
+            this.label8.Size = new System.Drawing.Size(197, 41);
+            this.label8.TabIndex = 193;
+            this.label8.Text = "打印机列表1";
+            // 
+            // 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(1198, 866);
+            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 = 206;
+            this.PrintSecond.Text = "打印副标签";
+            this.PrintSecond.UseVisualStyleBackColor = true;
+            // 
             // Packing_PackageCollectionWeigh
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 24F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(1758, 1164);
+            this.Controls.Add(this.PrintSecond);
+            this.Controls.Add(this.PrintLabel1);
             this.Controls.Add(this.label6);
+            this.Controls.Add(this.label7);
             this.Controls.Add(this.Remark_PreFix);
+            this.Controls.Add(this.PrintList1);
+            this.Controls.Add(this.label8);
             this.Controls.Add(this.AllowRepeat);
             this.Controls.Add(this.CollecRemark);
             this.Controls.Add(this.pa_remark);
@@ -1327,5 +1392,10 @@
         private System.Windows.Forms.CheckBox AllowRepeat;
         private System.Windows.Forms.Label label6;
         private CustomControl.TextBoxWithIcon.SnCollectionBox Remark_PreFix;
+        private CustomControl.ComBoxWithFocus.ComboxWithTip PrintLabel1;
+        private System.Windows.Forms.Label label7;
+        private CustomControl.ComBoxWithFocus.PrinterCombox PrintList1;
+        private System.Windows.Forms.Label label8;
+        private System.Windows.Forms.CheckBox PrintSecond;
     }
 }

+ 15 - 0
UAS_MES_LGDZ/FunctionCode/Packing/Packing_PackageCollectionWeigh.cs

@@ -235,6 +235,17 @@ namespace UAS_MES_NEW.Packing
                     {
                         OperateResult.AppendText(ErrorMessage + "\n", Color.Red);
                     }
+                    if (PrintSecond.Checked)
+                    {
+                        if (Print.BarTender(Tag.ToString(), ref engine, PrintLabel1.Text, PrintLabel1.SelectedValue.ToString(), PrintList1.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();
@@ -616,6 +627,10 @@ namespace UAS_MES_NEW.Packing
                 PrintLabel.DataSource = _dt;
                 PrintLabel.DisplayMember = "la_url";
                 PrintLabel.ValueMember = "la_id";
+
+                PrintLabel1.DataSource = _dt.Copy();
+                PrintLabel1.DisplayMember = "la_url";
+                PrintLabel1.ValueMember = "la_id";
             }
         }
 

+ 18 - 0
UAS_MES_LGDZ/FunctionCode/Packing/Packing_PackageCollectionWeigh.resx

@@ -212,6 +212,24 @@
   <metadata name="pd_id.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="pd_barcode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="pa_outboxcode1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="pa_prodcode1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="pd_innerqty.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="pa_indate.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="pd_id.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <data name="DeleteAll.DownImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m

+ 89 - 8
UAS_MES_LGDZ/FunctionCode/Query/Query_SN.Designer.cs

@@ -37,6 +37,12 @@
             this.label3 = new System.Windows.Forms.Label();
             this.PrintNum = new System.Windows.Forms.NumericUpDown();
             this.label4 = new System.Windows.Forms.Label();
+            this.label6 = new System.Windows.Forms.Label();
+            this.pr_detail = new System.Windows.Forms.Label();
+            this.label7 = new System.Windows.Forms.Label();
+            this.lade = new System.Windows.Forms.Label();
+            this.ma_qty = new System.Windows.Forms.Label();
+            this.ma_printcount = new System.Windows.Forms.Label();
             this.pr_code = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.OperateResult = new UAS_MES_NEW.CustomControl.RichText.RichTextAutoBottom();
             this.PrintLabel = new UAS_MES_NEW.CustomControl.ComBoxWithFocus.ComboxWithTip(this.components);
@@ -50,7 +56,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(120, 112);
+            this.label5.Location = new System.Drawing.Point(120, 172);
             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);
@@ -72,7 +78,7 @@
             // 
             this.label2.AutoSize = true;
             this.label2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label2.Location = new System.Drawing.Point(152, 187);
+            this.label2.Location = new System.Drawing.Point(152, 298);
             this.label2.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label2.Name = "label2";
             this.label2.Size = new System.Drawing.Size(114, 41);
@@ -83,7 +89,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(184, 271);
+            this.label3.Location = new System.Drawing.Point(184, 369);
             this.label3.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label3.Name = "label3";
             this.label3.Size = new System.Drawing.Size(82, 41);
@@ -92,7 +98,7 @@
             // 
             // PrintNum
             // 
-            this.PrintNum.Location = new System.Drawing.Point(305, 365);
+            this.PrintNum.Location = new System.Drawing.Point(305, 460);
             this.PrintNum.Name = "PrintNum";
             this.PrintNum.Size = new System.Drawing.Size(120, 35);
             this.PrintNum.TabIndex = 222;
@@ -101,19 +107,82 @@
             // 
             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(120, 359);
+            this.label4.Location = new System.Drawing.Point(120, 454);
             this.label4.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label4.Name = "label4";
             this.label4.Size = new System.Drawing.Size(146, 41);
             this.label4.TabIndex = 223;
             this.label4.Text = "打印数量";
             // 
+            // label6
+            // 
+            this.label6.AutoSize = true;
+            this.label6.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label6.Location = new System.Drawing.Point(120, 237);
+            this.label6.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+            this.label6.Name = "label6";
+            this.label6.Size = new System.Drawing.Size(146, 41);
+            this.label6.TabIndex = 226;
+            this.label6.Text = "产品名称";
+            // 
+            // pr_detail
+            // 
+            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(298, 237);
+            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);
+            this.pr_detail.TabIndex = 227;
+            // 
+            // label7
+            // 
+            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(120, 105);
+            this.label7.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+            this.label7.Name = "label7";
+            this.label7.Size = new System.Drawing.Size(146, 41);
+            this.label7.TabIndex = 228;
+            this.label7.Text = "工单数量";
+            // 
+            // lade
+            // 
+            this.lade.AutoSize = true;
+            this.lade.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.lade.Location = new System.Drawing.Point(441, 105);
+            this.lade.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+            this.lade.Name = "lade";
+            this.lade.Size = new System.Drawing.Size(146, 41);
+            this.lade.TabIndex = 229;
+            this.lade.Text = "已打印数";
+            // 
+            // ma_qty
+            // 
+            this.ma_qty.AutoSize = true;
+            this.ma_qty.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.ma_qty.Location = new System.Drawing.Point(298, 105);
+            this.ma_qty.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+            this.ma_qty.Name = "ma_qty";
+            this.ma_qty.Size = new System.Drawing.Size(0, 41);
+            this.ma_qty.TabIndex = 230;
+            // 
+            // ma_printcount
+            // 
+            this.ma_printcount.AutoSize = true;
+            this.ma_printcount.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.ma_printcount.Location = new System.Drawing.Point(599, 105);
+            this.ma_printcount.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+            this.ma_printcount.Name = "ma_printcount";
+            this.ma_printcount.Size = new System.Drawing.Size(0, 41);
+            this.ma_printcount.TabIndex = 231;
+            // 
             // pr_code
             // 
             this.pr_code.AllPower = null;
             this.pr_code.BackColor = System.Drawing.Color.White;
             this.pr_code.ID = null;
-            this.pr_code.Location = new System.Drawing.Point(305, 121);
+            this.pr_code.Location = new System.Drawing.Point(305, 181);
             this.pr_code.Name = "pr_code";
             this.pr_code.Power = null;
             this.pr_code.Size = new System.Drawing.Size(388, 35);
@@ -137,7 +206,7 @@
             // 
             this.PrintLabel.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.PrintLabel.FormattingEnabled = true;
-            this.PrintLabel.Location = new System.Drawing.Point(305, 280);
+            this.PrintLabel.Location = new System.Drawing.Point(305, 375);
             this.PrintLabel.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.PrintLabel.Name = "PrintLabel";
             this.PrintLabel.Size = new System.Drawing.Size(388, 32);
@@ -145,7 +214,7 @@
             // 
             // PrinterList
             // 
-            this.PrinterList.Location = new System.Drawing.Point(305, 197);
+            this.PrinterList.Location = new System.Drawing.Point(305, 304);
             this.PrinterList.Margin = new System.Windows.Forms.Padding(8);
             this.PrinterList.Name = "PrinterList";
             this.PrinterList.Size = new System.Drawing.Size(388, 50);
@@ -198,6 +267,12 @@
             this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 24F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(1494, 1075);
+            this.Controls.Add(this.ma_printcount);
+            this.Controls.Add(this.ma_qty);
+            this.Controls.Add(this.lade);
+            this.Controls.Add(this.label7);
+            this.Controls.Add(this.pr_detail);
+            this.Controls.Add(this.label6);
             this.Controls.Add(this.pr_code);
             this.Controls.Add(this.OperateResult);
             this.Controls.Add(this.label4);
@@ -236,5 +311,11 @@
         private System.Windows.Forms.Label label4;
         private CustomControl.RichText.RichTextAutoBottom OperateResult;
         private CustomControl.TextBoxWithIcon.EnterTextBox pr_code;
+        private System.Windows.Forms.Label label6;
+        private System.Windows.Forms.Label pr_detail;
+        private System.Windows.Forms.Label label7;
+        private System.Windows.Forms.Label lade;
+        private System.Windows.Forms.Label ma_qty;
+        private System.Windows.Forms.Label ma_printcount;
     }
 }

+ 12 - 1
UAS_MES_LGDZ/FunctionCode/Query/Query_SN.cs

@@ -55,10 +55,13 @@ namespace UAS_MES_NEW.Query
         {
             Dbfind = ma_code.ReturnData;
             BaseUtil.SetFormValue(this.Controls, Dbfind);
-            DataTable dt = (DataTable)dh.ExecuteSql("select ma_prodcode from make where ma_code='" + ma_code.Text + "'", "select");
+            DataTable dt = (DataTable)dh.ExecuteSql("select ma_qty,ma_prodcode,pr_detail,ma_printnum from make left join product on ma_prodcode=pr_code left join (select count(1)ma_printnum,mil_makecode from makeimeilist where mil_printstatus=-1 group by mil_makecode) on mil_makecode=ma_code where ma_code='" + ma_code.Text + "'", "select");
             if (dt.Rows.Count > 0)
             {
                 pr_code.Text = dt.Rows[0]["ma_prodcode"].ToString();
+                ma_qty.Text = dt.Rows[0]["ma_qty"].ToString();
+                ma_printcount.Text = dt.Rows[0]["ma_printnum"].ToString();
+                pr_detail.Text = dt.Rows[0]["pr_detail"].ToString();
             }
         }
 
@@ -99,6 +102,14 @@ namespace UAS_MES_NEW.Query
                     OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Green);
                 }
             }
+            dt = (DataTable)dh.ExecuteSql("select ma_qty,ma_prodcode,pr_detail,ma_printnum from make left join product on ma_prodcode=pr_code left join (select count(1)ma_printnum,mil_makecode from makeimeilist where mil_printstatus=-1 group by mil_makecode) on mil_makecode=ma_code where ma_code='" + ma_code.Text + "'", "select");
+            if (dt.Rows.Count > 0)
+            {
+                pr_code.Text = dt.Rows[0]["ma_prodcode"].ToString();
+                ma_qty.Text = dt.Rows[0]["ma_qty"].ToString();
+                ma_printcount.Text = dt.Rows[0]["ma_printnum"].ToString();
+                pr_detail.Text = dt.Rows[0]["pr_detail"].ToString();
+            }
         }
 
         private void pr_code_TextChanged(object sender, EventArgs e)

+ 9 - 0
UAS_MES_LGDZ/UAS_MES_LGDZ.csproj

@@ -593,6 +593,12 @@
     <Compile Include="FunctionCode\Make\Make_GetTestFileData.Designer.cs">
       <DependentUpon>Make_GetTestFileData.cs</DependentUpon>
     </Compile>
+    <Compile Include="FunctionCode\Make\Make_OutBoxSnCheck.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="FunctionCode\Make\Make_OutBoxSnCheck.Designer.cs">
+      <DependentUpon>Make_OutBoxSnCheck.cs</DependentUpon>
+    </Compile>
     <Compile Include="FunctionCode\Make\Make_ReadWriteInfo.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -1455,6 +1461,9 @@
     <EmbeddedResource Include="FunctionCode\Make\Make_GetTestFileData.resx">
       <DependentUpon>Make_GetTestFileData.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="FunctionCode\Make\Make_OutBoxSnCheck.resx">
+      <DependentUpon>Make_OutBoxSnCheck.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="FunctionCode\Make\Make_ReadWriteInfo.resx">
       <DependentUpon>Make_ReadWriteInfo.cs</DependentUpon>
     </EmbeddedResource>