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

UAS-MES/CustomControl/CustomCheckBox/AutoPrintCheckBox.Designer.cs

@@ -0,0 +1,62 @@
+namespace UAS_MES.CustomControl.CustomCheckBox
+{
+    partial class AutoPrintCheckBox
+    {
+        /// <summary> 
+        /// 必需的设计器变量。
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary> 
+        /// 清理所有正在使用的资源。
+        /// </summary>
+        /// <param name="disposing">如果应释放托管资源，为 true；否则为 false。</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region 组件设计器生成的代码
+
+        /// <summary> 
+        /// 设计器支持所需的方法 - 不要修改
+        /// 使用代码编辑器修改此方法的内容。
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.AutoPrint = new System.Windows.Forms.CheckBox();
+            this.SuspendLayout();
+            // 
+            // AutoPrint
+            // 
+            this.AutoPrint.AutoSize = true;
+            this.AutoPrint.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.AutoPrint.Font = new System.Drawing.Font("微软雅黑", 10.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.AutoPrint.Location = new System.Drawing.Point(0, 0);
+            this.AutoPrint.Name = "AutoPrint";
+            this.AutoPrint.Size = new System.Drawing.Size(125, 34);
+            this.AutoPrint.TabIndex = 0;
+            this.AutoPrint.Text = "自动打印";
+            this.AutoPrint.UseVisualStyleBackColor = true;
+            // 
+            // AutoPrintCheckBox
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.Controls.Add(this.AutoPrint);
+            this.Name = "AutoPrintCheckBox";
+            this.Size = new System.Drawing.Size(125, 34);
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.CheckBox AutoPrint;
+    }
+}

UAS-MES/CustomControl/CustomCheckBox/AutoPrintCheckBox.cs

@@ -0,0 +1,56 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Drawing;
+using System.Data;
+using System.Linq;
+using System.Text;
+using System.Windows.Forms;
+using UAS_MES.Entity;
+
+namespace UAS_MES.CustomControl.CustomCheckBox
+{
+    public partial class AutoPrintCheckBox : UserControl
+    {
+
+        public AutoPrintCheckBox()
+        {
+            InitializeComponent();
+            this.Load += AutoPrintCheckBox_Load;
+        }
+
+        private void AutoPrintCheckBox_Load(object sender, EventArgs e)
+        {
+            if (SystemInf.EnablePrint)
+                AutoPrint.Checked = true;
+            else
+                AutoPrint.Checked = false;
+        }
+
+        public bool Checked
+        {
+            get
+            {
+                return AutoPrint.Checked;
+            }
+
+            set
+            {
+                AutoPrint.Checked = value;
+            }
+        }
+
+        public override string Text
+        {
+            get
+            {
+                return AutoPrint.Text;
+            }
+
+            set
+            {
+                AutoPrint.Text = value;
+            }
+        }
+    }
+}

UAS-MES/CustomControl/CustomCheckBox/AutoPrintCheckBox.resx

@@ -0,0 +1,120 @@
+<?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>
+</root>

UAS-MES/DataOperate/DataHelper.cs

@@ -61,6 +61,7 @@ namespace UAS_MES.DataOperate
             Reconnect(command);
             OracleDataAdapter ad = new OracleDataAdapter();
             ad.SelectCommand = command;
+            Console.WriteLine(sql);
             try
             {
                 ad.Fill(dt);
@@ -479,6 +480,7 @@ namespace UAS_MES.DataOperate
         {
             string sql = "select count(1) from " + TableName + " where " + Condition;
             command = new OracleCommand(sql, connection);
+            Console.WriteLine(sql);
             Reconnect(command);
             OracleDataAdapter ad = new OracleDataAdapter(command);
             DataTable dt = new DataTable();
@@ -525,6 +527,7 @@ namespace UAS_MES.DataOperate
                 for (int i = 0; i < addpar.Length; i++)
                     command.Parameters.Add(new OracleParameter(addpar[i].ToString(), OracleDbType.Varchar2, names[i], ParameterDirection.Input));
             }
+            Console.WriteLine(SQL);
             switch (Type.ToUpper())
             {
                 case "SELECT":
@@ -799,7 +802,7 @@ namespace UAS_MES.DataOperate
             command = new OracleCommand(sql, connection);
             Reconnect(command);
             command.ArrayBindCount = names[1].Length;
-
+            Console.WriteLine(sql);
             //因为第一个数组保存的是参数的名称，所以循环从1而不是0开始
             //将第一个数组的下标固定为0作为循环添加的参数的名称
             for (int i = 1; i <= names[0].Length; i++)
@@ -909,6 +912,7 @@ namespace UAS_MES.DataOperate
         {
             string sql = "update " + TableName + " set " + update + " where " + condition;
             command = new OracleCommand(sql, connection);
+            Console.WriteLine(sql);
             Reconnect(command);
             try
             {

UAS-MES/Entity/SystemInf.cs

@@ -52,5 +52,9 @@ namespace UAS_MES.Entity
         /// 当前程序进程ID
         /// </summary>
         public static int ProcessesID;
+        /// <summary>
+        /// 是否允许打印程序
+        /// </summary>
+        public static bool EnablePrint;
     }
 }

UAS-MES/Form1.Designer.cs

@@ -28,29 +28,8 @@
         /// </summary>
         private void InitializeComponent()
         {
-            System.Windows.Forms.DataVisualization.Charting.ChartArea chartArea1 = new System.Windows.Forms.DataVisualization.Charting.ChartArea();
-            System.Windows.Forms.DataVisualization.Charting.Legend legend1 = new System.Windows.Forms.DataVisualization.Charting.Legend();
-            System.Windows.Forms.DataVisualization.Charting.Series series1 = new System.Windows.Forms.DataVisualization.Charting.Series();
-            System.Windows.Forms.DataVisualization.Charting.ChartArea chartArea2 = new System.Windows.Forms.DataVisualization.Charting.ChartArea();
-            System.Windows.Forms.DataVisualization.Charting.Legend legend2 = new System.Windows.Forms.DataVisualization.Charting.Legend();
-            System.Windows.Forms.DataVisualization.Charting.Series series2 = new System.Windows.Forms.DataVisualization.Charting.Series();
-            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Form1));
             this.button1 = new System.Windows.Forms.Button();
             this.button2 = new System.Windows.Forms.Button();
-            this.ct_coll = new System.Windows.Forms.DataVisualization.Charting.Chart();
-            this.paintpanel = new System.Windows.Forms.Panel();
-            this.chart1 = new System.Windows.Forms.DataVisualization.Charting.Chart();
-            this.enterTextBox2 = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
-            this.valueLabel1 = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
-            this.normalButton2 = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
-            this.normalButton3 = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
-            this.测试GetSNALL = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
-            this.TestDGV = new UAS_MES.CustomControl.DataGrid_View.DataGridViewWithCheckBox();
-            this.numOnlyTextBox1 = new UAS_MES.CustomControl.TextBoxWithIcon.NumOnlyTextBox();
-            this.blurSearch1 = new UAS_MES.CustomControl.TextBoxWithIcon.BlurSearch();
-            ((System.ComponentModel.ISupportInitialize)(this.ct_coll)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.chart1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.TestDGV)).BeginInit();
             this.SuspendLayout();
             // 
             // button1
@@ -73,205 +52,17 @@
             this.button2.Text = "button2";
             this.button2.UseVisualStyleBackColor = true;
             // 
-            // ct_coll
-            // 
-            this.ct_coll.BackColor = System.Drawing.SystemColors.Control;
-            this.ct_coll.BackHatchStyle = System.Windows.Forms.DataVisualization.Charting.ChartHatchStyle.Cross;
-            this.ct_coll.BackImageTransparentColor = System.Drawing.SystemColors.Control;
-            this.ct_coll.BorderlineColor = System.Drawing.SystemColors.Control;
-            chartArea1.CursorX.IsUserEnabled = true;
-            chartArea1.Name = "ChartArea1";
-            this.ct_coll.ChartAreas.Add(chartArea1);
-            legend1.Enabled = false;
-            legend1.Name = "Legend1";
-            this.ct_coll.Legends.Add(legend1);
-            this.ct_coll.Location = new System.Drawing.Point(34, 206);
-            this.ct_coll.Margin = new System.Windows.Forms.Padding(2);
-            this.ct_coll.Name = "ct_coll";
-            this.ct_coll.Palette = System.Windows.Forms.DataVisualization.Charting.ChartColorPalette.None;
-            series1.ChartArea = "ChartArea1";
-            series1.ChartType = System.Windows.Forms.DataVisualization.Charting.SeriesChartType.Pie;
-            series1.IsXValueIndexed = true;
-            series1.Label = "#PERCENT#VALX :#VAL";
-            series1.Legend = "Legend1";
-            series1.LegendText = "#VALX";
-            series1.Name = "Series1";
-            this.ct_coll.Series.Add(series1);
-            this.ct_coll.Size = new System.Drawing.Size(50, 91);
-            this.ct_coll.TabIndex = 5;
-            this.ct_coll.Text = "chart1";
-            // 
-            // paintpanel
-            // 
-            this.paintpanel.Location = new System.Drawing.Point(46, 535);
-            this.paintpanel.Name = "paintpanel";
-            this.paintpanel.Size = new System.Drawing.Size(98, 10);
-            this.paintpanel.TabIndex = 13;
-            this.paintpanel.Paint += new System.Windows.Forms.PaintEventHandler(this.panel1_Paint);
-            // 
-            // chart1
-            // 
-            chartArea2.Name = "ChartArea1";
-            this.chart1.ChartAreas.Add(chartArea2);
-            legend2.Name = "Legend1";
-            this.chart1.Legends.Add(legend2);
-            this.chart1.Location = new System.Drawing.Point(132, 216);
-            this.chart1.Name = "chart1";
-            series2.ChartArea = "ChartArea1";
-            series2.IsValueShownAsLabel = true;
-            series2.Legend = "Legend1";
-            series2.Name = "Series1";
-            this.chart1.Series.Add(series2);
-            this.chart1.Size = new System.Drawing.Size(739, 300);
-            this.chart1.TabIndex = 17;
-            this.chart1.Text = "chart1";
-            // 
-            // enterTextBox2
-            // 
-            this.enterTextBox2.AllPower = null;
-            this.enterTextBox2.BackColor = System.Drawing.Color.White;
-            this.enterTextBox2.ID = null;
-            this.enterTextBox2.Location = new System.Drawing.Point(273, 133);
-            this.enterTextBox2.Name = "enterTextBox2";
-            this.enterTextBox2.Power = null;
-            this.enterTextBox2.Size = new System.Drawing.Size(196, 21);
-            this.enterTextBox2.Str = null;
-            this.enterTextBox2.Str1 = null;
-            this.enterTextBox2.Str2 = null;
-            this.enterTextBox2.TabIndex = 16;
-            this.enterTextBox2.KeyDown += new System.Windows.Forms.KeyEventHandler(this.enterTextBox2_KeyDown);
-            // 
-            // valueLabel1
-            // 
-            this.valueLabel1.AutoSize = true;
-            this.valueLabel1.CutLength = null;
-            this.valueLabel1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.valueLabel1.Location = new System.Drawing.Point(271, 170);
-            this.valueLabel1.MaximumSize = new System.Drawing.Size(200, 0);
-            this.valueLabel1.Name = "valueLabel1";
-            this.valueLabel1.Size = new System.Drawing.Size(0, 21);
-            this.valueLabel1.TabIndex = 14;
-            this.valueLabel1.TextChanged += new System.EventHandler(this.valueLabel1_TextChanged);
-            // 
-            // normalButton2
-            // 
-            this.normalButton2.AllPower = null;
-            this.normalButton2.BackColor = System.Drawing.Color.Transparent;
-            this.normalButton2.DownImage = ((System.Drawing.Image)(resources.GetObject("normalButton2.DownImage")));
-            this.normalButton2.Image = null;
-            this.normalButton2.IsShowBorder = true;
-            this.normalButton2.Location = new System.Drawing.Point(273, 91);
-            this.normalButton2.Margin = new System.Windows.Forms.Padding(2);
-            this.normalButton2.MoveImage = ((System.Drawing.Image)(resources.GetObject("normalButton2.MoveImage")));
-            this.normalButton2.Name = "normalButton2";
-            this.normalButton2.NormalImage = ((System.Drawing.Image)(resources.GetObject("normalButton2.NormalImage")));
-            this.normalButton2.Power = null;
-            this.normalButton2.Size = new System.Drawing.Size(118, 22);
-            this.normalButton2.TabIndex = 12;
-            this.normalButton2.Text = "分配MAC地址和BT地址";
-            this.normalButton2.UseVisualStyleBackColor = false;
-            this.normalButton2.Click += new System.EventHandler(this.normalButton2_Click_1);
-            // 
-            // normalButton3
-            // 
-            this.normalButton3.AllPower = null;
-            this.normalButton3.BackColor = System.Drawing.Color.Transparent;
-            this.normalButton3.DownImage = ((System.Drawing.Image)(resources.GetObject("normalButton3.DownImage")));
-            this.normalButton3.Image = null;
-            this.normalButton3.IsShowBorder = true;
-            this.normalButton3.Location = new System.Drawing.Point(445, 33);
-            this.normalButton3.Margin = new System.Windows.Forms.Padding(2);
-            this.normalButton3.MoveImage = ((System.Drawing.Image)(resources.GetObject("normalButton3.MoveImage")));
-            this.normalButton3.Name = "normalButton3";
-            this.normalButton3.NormalImage = ((System.Drawing.Image)(resources.GetObject("normalButton3.NormalImage")));
-            this.normalButton3.Power = null;
-            this.normalButton3.Size = new System.Drawing.Size(118, 22);
-            this.normalButton3.TabIndex = 11;
-            this.normalButton3.Text = "分配IMEI地址信息";
-            this.normalButton3.UseVisualStyleBackColor = false;
-            this.normalButton3.Click += new System.EventHandler(this.normalButton3_Click);
-            // 
-            // 测试GetSNALL
-            // 
-            this.测试GetSNALL.AllPower = null;
-            this.测试GetSNALL.BackColor = System.Drawing.Color.Transparent;
-            this.测试GetSNALL.DownImage = ((System.Drawing.Image)(resources.GetObject("测试GetSNALL.DownImage")));
-            this.测试GetSNALL.Image = null;
-            this.测试GetSNALL.IsShowBorder = true;
-            this.测试GetSNALL.Location = new System.Drawing.Point(589, 44);
-            this.测试GetSNALL.Margin = new System.Windows.Forms.Padding(2);
-            this.测试GetSNALL.MoveImage = ((System.Drawing.Image)(resources.GetObject("测试GetSNALL.MoveImage")));
-            this.测试GetSNALL.Name = "测试GetSNALL";
-            this.测试GetSNALL.NormalImage = ((System.Drawing.Image)(resources.GetObject("测试GetSNALL.NormalImage")));
-            this.测试GetSNALL.Power = null;
-            this.测试GetSNALL.Size = new System.Drawing.Size(99, 22);
-            this.测试GetSNALL.TabIndex = 10;
-            this.测试GetSNALL.Text = "测试GetSNALL";
-            this.测试GetSNALL.UseVisualStyleBackColor = false;
-            this.测试GetSNALL.Click += new System.EventHandler(this.normalButton2_Click);
-            // 
-            // TestDGV
-            // 
-            this.TestDGV.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-            this.TestDGV.Location = new System.Drawing.Point(34, 105);
-            this.TestDGV.Margin = new System.Windows.Forms.Padding(2);
-            this.TestDGV.Name = "TestDGV";
-            this.TestDGV.RowTemplate.Height = 27;
-            this.TestDGV.Size = new System.Drawing.Size(154, 86);
-            this.TestDGV.TabIndex = 9;
-            // 
-            // numOnlyTextBox1
-            // 
-            this.numOnlyTextBox1.AllPower = null;
-            this.numOnlyTextBox1.BackColor = System.Drawing.Color.White;
-            this.numOnlyTextBox1.ID = null;
-            this.numOnlyTextBox1.Location = new System.Drawing.Point(243, 46);
-            this.numOnlyTextBox1.Margin = new System.Windows.Forms.Padding(2);
-            this.numOnlyTextBox1.Name = "numOnlyTextBox1";
-            this.numOnlyTextBox1.Negative = false;
-            this.numOnlyTextBox1.Power = null;
-            this.numOnlyTextBox1.Size = new System.Drawing.Size(148, 21);
-            this.numOnlyTextBox1.Str = null;
-            this.numOnlyTextBox1.Str1 = null;
-            this.numOnlyTextBox1.Str2 = null;
-            this.numOnlyTextBox1.TabIndex = 8;
-            // 
-            // blurSearch1
-            // 
-            this.blurSearch1.Field = null;
-            this.blurSearch1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.blurSearch1.Location = new System.Drawing.Point(34, 46);
-            this.blurSearch1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            this.blurSearch1.Name = "blurSearch1";
-            this.blurSearch1.Size = new System.Drawing.Size(154, 29);
-            this.blurSearch1.TabIndex = 0;
-            this.blurSearch1.TableName = null;
-            // 
             // Form1
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(929, 590);
-            this.Controls.Add(this.chart1);
-            this.Controls.Add(this.enterTextBox2);
-            this.Controls.Add(this.valueLabel1);
-            this.Controls.Add(this.paintpanel);
-            this.Controls.Add(this.normalButton2);
-            this.Controls.Add(this.normalButton3);
-            this.Controls.Add(this.测试GetSNALL);
-            this.Controls.Add(this.TestDGV);
-            this.Controls.Add(this.numOnlyTextBox1);
-            this.Controls.Add(this.ct_coll);
-            this.Controls.Add(this.blurSearch1);
+            this.ClientSize = new System.Drawing.Size(1239, 738);
+            this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.Name = "Form1";
             this.Tag = "123123";
             this.Text = "Form1";
             this.Load += new System.EventHandler(this.Form1_Load);
-            ((System.ComponentModel.ISupportInitialize)(this.ct_coll)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.chart1)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.TestDGV)).EndInit();
             this.ResumeLayout(false);
-            this.PerformLayout();
 
         }
 
@@ -282,16 +73,5 @@
         private CustomControl.ButtonUtil.NormalButton normalButton1;
         private CustomControl.TextBoxWithIcon.EnterTextBox enterTextBox1;
         private CustomControl.SetLoading.LoadingCircle loadingCircle1;
-        private CustomControl.TextBoxWithIcon.BlurSearch blurSearch1;
-        private System.Windows.Forms.DataVisualization.Charting.Chart ct_coll;
-        private CustomControl.TextBoxWithIcon.NumOnlyTextBox numOnlyTextBox1;
-        private CustomControl.DataGrid_View.DataGridViewWithCheckBox TestDGV;
-        private CustomControl.ButtonUtil.NormalButton 测试GetSNALL;
-        private CustomControl.ButtonUtil.NormalButton normalButton3;
-        private CustomControl.ButtonUtil.NormalButton normalButton2;
-        private System.Windows.Forms.Panel paintpanel;
-        private CustomControl.ValueLabel.ValueLabel valueLabel1;
-        private CustomControl.TextBoxWithIcon.EnterTextBox enterTextBox2;
-        private System.Windows.Forms.DataVisualization.Charting.Chart chart1;
     }
 }

UAS-MES/Form1.cs

@@ -45,168 +45,9 @@ namespace UAS_MES
 
         private void Form1_Load(object sender, EventArgs e)
         {
-            DataGridViewCheckBoxColumn checkboxCol = new DataGridViewCheckBoxColumn();
-            checkboxCol.Name = "全选";
-            //创建复选框列头单元格  
-            DataGridViewCheckBoxHeaderCell ch = new DataGridViewCheckBoxHeaderCell(TestDGV, checkboxCol);
+        
 
-            //设置复选框那列的单元格为复选框  
-            checkboxCol.HeaderCell = ch;
-            this.TestDGV.Columns.Add(checkboxCol);
-            blurSearch1.TableName = "Make";
-            blurSearch1.Field = "ma_code";
-            DataHelper dh = new DataHelper();
-            DataTable _dt = (DataTable)dh.ExecuteSql("select count(ms_code) as ms_code_sum,(to_char (ms_indate,'yyyy-mm-dd')) ms_date from MAKESERIAL GROUP BY (to_char (ms_indate,'yyyy-mm-dd')) order by (to_char (ms_indate,'yyyy-mm-dd')) asc", "select");
-            BaseUtil.ViewChart(chart1, _dt,SeriesChartType.Line, "datetitle", "ms_date", "ms_code_sum","生产日期","生产数");
-            dt = (DataTable)dh.ExecuteSql("select ma_salecode,MA_STATUS from make where MA_SALECODE = 'TB17040014'", "select");
-            Step = new Dictionary<int, string>();
-            for (int i = 0; i < dt.Rows.Count + 2; i++)
-            {
-                if (i == 0)
-                {
-                    Step.Add(i, "开始");
-                }
-                else if (i == dt.Rows.Count + 1)
-                {
-                    Step.Add(i, "结束");
-                }
-                else {
-                    Step.Add(i, dt.Rows[i - 1]["MA_STATUS"].ToString());
-                }    
-            } 
-
-        }
-
-       
-
-        private void normalButton2_Click(object sender, EventArgs e)
-        {
-            DataHelper dh = new DataHelper();
-            string ErrorMessage = "";
-            string makecode = "";
-            string IMEI1 = "";
-            string IMEI2 = "";
-            string IMEI3 = "";
-            string IMEID = "";
-            string NetCode = "";
-            string PSN = "";
-            string MAC = "";
-            string BT = "";
-            string Code1 = "";
-            string Code2 = "";
-            string Code3 = "";
-            string ID1 = "";
-            string ID2 = "";
-            string ID3 = "";
-            LogicHandler.GetSNAllInfo("123133",out IMEI1,out IMEI2,out IMEI3,out IMEID,out NetCode,out PSN,out MAC,out BT,out Code1,out Code2,out Code3,out ID1,out ID2,out ID3,out ErrorMessage);
-            Console.WriteLine(IMEI1);
-            Console.WriteLine(IMEI2);
-            Console.WriteLine(IMEI3);
-            Console.WriteLine(IMEID);
-            Console.WriteLine(NetCode);
-            Console.WriteLine(PSN);
-            Console.WriteLine(MAC);
-            Console.WriteLine(BT);
-            Console.WriteLine(Code1);
-            Console.WriteLine(Code2);
-            Console.WriteLine(Code3);
-            Console.WriteLine(ID1);
-            Console.WriteLine(ID2);
-            Console.WriteLine(ID3);
-            Console.WriteLine(ErrorMessage);
-
-        }
-
-        private void normalButton3_Click(object sender, EventArgs e)
-        {
-            DataHelper dh = new DataHelper();
-            string ErrorMessage = "";
-            string makecode = "";
-            string IMEI1 = "";
-            string IMEI2 = "";
-            string IMEI3 = "";
-            string IMEID = "";
-            string NetCode = "";
-            string PSN = "";
-            string MAC = "";
-            string BT = "";
-            string ID1 = "";
-            string ID2 = "";
-            string ID3 = "";
-            LogicHandler.GetIMEIOrNetCodeRange("123133", "MAKED800", "IME1", "NETCODE", out IMEI1, out IMEI2, out IMEI3, out IMEID, out NetCode, out PSN, out ID1, out ID2, out ID3, out ErrorMessage);
-            Console.WriteLine(IMEI1);
-            Console.WriteLine(IMEI2);
-            Console.WriteLine(IMEI3);
-            Console.WriteLine(IMEID);
-            Console.WriteLine(NetCode);
-            Console.WriteLine(PSN);
-            Console.WriteLine(MAC);
-            Console.WriteLine(BT);
-            Console.WriteLine(ID1);
-            Console.WriteLine(ID2);
-            Console.WriteLine(ID3);
-            Console.WriteLine(ErrorMessage);
         }
 
-        private void normalButton2_Click_1(object sender, EventArgs e)
-        {
-            DataHelper dh = new DataHelper();
-            string ErrorMessage = "";
-            string makecode = "";
-            string MAC = "";
-            string BT = "";
-            string Code1 = "";
-            string Code2 = "";
-            string Code3 = "";
-            LogicHandler.GetAddressRangeByMakeCode("123133", "MAKED800", out MAC,out BT, out Code1, out Code2, out Code3, out ErrorMessage);
-            Console.WriteLine(MAC);
-            Console.WriteLine(BT);
-            Console.WriteLine(Code1);
-            Console.WriteLine(Code2);
-            Console.WriteLine(Code3);
-            Console.WriteLine(ErrorMessage);
-        }
-
-        private void panel1_Paint(object sender, PaintEventArgs e)
-        {
-            int rowspaint = 5;
-            //画板工具
-            Graphics g = e.Graphics;
-            //矩形
-            Rectangle r = new Rectangle(0,0,40,40);
-            r.Width = paintpanel.Width / 10;
-            r.Height = paintpanel.Height / 8;
-            int x = 40;
-            int y = paintpanel.Height / 8;
-            Pen p = new Pen(Color.Green, 15);
-            p.StartCap = LineCap.Triangle;
-            p.EndCap = LineCap.ArrowAnchor;
-
-            for (int i = 0; i < 2; i++) {
-                r.Location = new Point(x, y);
-                g.FillRectangle(Brushes.Green, r);
-                x += r.Width*2;
-            }
-
-            g.DrawLine(p, x + 10, y+r.Height/2 , x + this.Width / 5, y + r.Height / 2 );
-
-
-
-        }
-
- 
-
-        private void enterTextBox2_KeyDown(object sender, KeyEventArgs e)
-        {
-            if (e.KeyCode == Keys.Enter)
-            {
-                valueLabel1.Text = enterTextBox2.Text.ToString();
-            }
-        }
-
-        private void valueLabel1_TextChanged(object sender, EventArgs e)
-        {
-
-        }
     }
 }

UAS-MES/Form1.resx

@@ -117,119 +117,4 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <data name="normalButton2.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="normalButton2.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="normalButton2.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>
-  <data name="normalButton3.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="normalButton3.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="normalButton3.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>
-  <data name="测试GetSNALL.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="测试GetSNALL.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="测试GetSNALL.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>

UAS-MES/FunctionCode/Make/Make_BigBoxCollection.Designer.cs

@@ -59,9 +59,9 @@
             this.Column4 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.Column5 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.pa_makecode = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
-            this.pa_packageqty = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
+            this.pa_standardqty = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
             this.pa_outboxcode = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
-            this.pa_totalqty = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
+            this.pa_currentqty = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
             this.pa_packageqty_label = new System.Windows.Forms.Label();
             this.Packing = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
             ((System.ComponentModel.ISupportInitialize)(this.PrintNum)).BeginInit();
@@ -72,10 +72,10 @@
             // 
             this.pa_outboxcode_label.AutoSize = true;
             this.pa_outboxcode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pa_outboxcode_label.Location = new System.Drawing.Point(30, 41);
+            this.pa_outboxcode_label.Location = new System.Drawing.Point(27, 34);
             this.pa_outboxcode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pa_outboxcode_label.Name = "pa_outboxcode_label";
-            this.pa_outboxcode_label.Size = new System.Drawing.Size(62, 31);
+            this.pa_outboxcode_label.Size = new System.Drawing.Size(52, 27);
             this.pa_outboxcode_label.TabIndex = 102;
             this.pa_outboxcode_label.Text = "箱号";
             // 
@@ -83,10 +83,10 @@
             // 
             this.pa_totalqty_label.AutoSize = true;
             this.pa_totalqty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pa_totalqty_label.Location = new System.Drawing.Point(352, 115);
+            this.pa_totalqty_label.Location = new System.Drawing.Point(313, 96);
             this.pa_totalqty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pa_totalqty_label.Name = "pa_totalqty_label";
-            this.pa_totalqty_label.Size = new System.Drawing.Size(110, 31);
+            this.pa_totalqty_label.Size = new System.Drawing.Size(92, 27);
             this.pa_totalqty_label.TabIndex = 104;
             this.pa_totalqty_label.Text = "已装数量";
             // 
@@ -94,10 +94,10 @@
             // 
             this.pa_makecode_label.AutoSize = true;
             this.pa_makecode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pa_makecode_label.Location = new System.Drawing.Point(352, 41);
+            this.pa_makecode_label.Location = new System.Drawing.Point(313, 34);
             this.pa_makecode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pa_makecode_label.Name = "pa_makecode_label";
-            this.pa_makecode_label.Size = new System.Drawing.Size(110, 31);
+            this.pa_makecode_label.Size = new System.Drawing.Size(92, 27);
             this.pa_makecode_label.TabIndex = 108;
             this.pa_makecode_label.Text = "制造单号";
             // 
@@ -107,10 +107,10 @@
             this.AutoPrint.Checked = true;
             this.AutoPrint.CheckState = System.Windows.Forms.CheckState.Checked;
             this.AutoPrint.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.AutoPrint.Location = new System.Drawing.Point(1108, 245);
-            this.AutoPrint.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.AutoPrint.Location = new System.Drawing.Point(985, 204);
+            this.AutoPrint.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.AutoPrint.Name = "AutoPrint";
-            this.AutoPrint.Size = new System.Drawing.Size(184, 35);
+            this.AutoPrint.Size = new System.Drawing.Size(154, 31);
             this.AutoPrint.TabIndex = 153;
             this.AutoPrint.Text = "满箱自动打印";
             this.AutoPrint.UseVisualStyleBackColor = true;
@@ -119,10 +119,10 @@
             // 
             this.pa_restqty_label.AutoSize = true;
             this.pa_restqty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pa_restqty_label.Location = new System.Drawing.Point(1102, 192);
+            this.pa_restqty_label.Location = new System.Drawing.Point(980, 160);
             this.pa_restqty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pa_restqty_label.Name = "pa_restqty_label";
-            this.pa_restqty_label.Size = new System.Drawing.Size(110, 31);
+            this.pa_restqty_label.Size = new System.Drawing.Size(92, 27);
             this.pa_restqty_label.TabIndex = 154;
             this.pa_restqty_label.Text = "打印张数";
             // 
@@ -130,10 +130,10 @@
             // 
             this.pa_custcode_label.AutoSize = true;
             this.pa_custcode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pa_custcode_label.Location = new System.Drawing.Point(1102, 41);
+            this.pa_custcode_label.Location = new System.Drawing.Point(980, 34);
             this.pa_custcode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pa_custcode_label.Name = "pa_custcode_label";
-            this.pa_custcode_label.Size = new System.Drawing.Size(62, 31);
+            this.pa_custcode_label.Size = new System.Drawing.Size(52, 27);
             this.pa_custcode_label.TabIndex = 157;
             this.pa_custcode_label.Text = "客户";
             // 
@@ -141,10 +141,10 @@
             // 
             this.palletcode_label.AutoSize = true;
             this.palletcode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.palletcode_label.Location = new System.Drawing.Point(1102, 407);
+            this.palletcode_label.Location = new System.Drawing.Point(980, 339);
             this.palletcode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.palletcode_label.Name = "palletcode_label";
-            this.palletcode_label.Size = new System.Drawing.Size(86, 31);
+            this.palletcode_label.Size = new System.Drawing.Size(72, 27);
             this.palletcode_label.TabIndex = 165;
             this.palletcode_label.Text = "大箱号";
             // 
@@ -152,10 +152,10 @@
             // 
             this.outboxcode_label.AutoSize = true;
             this.outboxcode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.outboxcode_label.Location = new System.Drawing.Point(1102, 473);
+            this.outboxcode_label.Location = new System.Drawing.Point(980, 394);
             this.outboxcode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.outboxcode_label.Name = "outboxcode_label";
-            this.outboxcode_label.Size = new System.Drawing.Size(110, 31);
+            this.outboxcode_label.Size = new System.Drawing.Size(92, 27);
             this.outboxcode_label.TabIndex = 166;
             this.outboxcode_label.Text = "卡通箱号";
             // 
@@ -163,10 +163,10 @@
             // 
             this.pa_prodcode_label.AutoSize = true;
             this.pa_prodcode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pa_prodcode_label.Location = new System.Drawing.Point(680, 41);
+            this.pa_prodcode_label.Location = new System.Drawing.Point(604, 34);
             this.pa_prodcode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pa_prodcode_label.Name = "pa_prodcode_label";
-            this.pa_prodcode_label.Size = new System.Drawing.Size(110, 31);
+            this.pa_prodcode_label.Size = new System.Drawing.Size(92, 27);
             this.pa_prodcode_label.TabIndex = 169;
             this.pa_prodcode_label.Text = "产品编号";
             // 
@@ -174,20 +174,20 @@
             // 
             this.PrintLabel.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.PrintLabel.FormattingEnabled = true;
-            this.PrintLabel.Location = new System.Drawing.Point(1243, 121);
+            this.PrintLabel.Location = new System.Drawing.Point(1105, 101);
             this.PrintLabel.Margin = new System.Windows.Forms.Padding(3, 1, 3, 1);
             this.PrintLabel.Name = "PrintLabel";
-            this.PrintLabel.Size = new System.Drawing.Size(219, 26);
+            this.PrintLabel.Size = new System.Drawing.Size(195, 23);
             this.PrintLabel.TabIndex = 172;
             // 
             // PrintLabel_label
             // 
             this.PrintLabel_label.AutoSize = true;
             this.PrintLabel_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.PrintLabel_label.Location = new System.Drawing.Point(1102, 119);
+            this.PrintLabel_label.Location = new System.Drawing.Point(980, 99);
             this.PrintLabel_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.PrintLabel_label.Name = "PrintLabel_label";
-            this.PrintLabel_label.Size = new System.Drawing.Size(110, 31);
+            this.PrintLabel_label.Size = new System.Drawing.Size(92, 27);
             this.PrintLabel_label.TabIndex = 174;
             this.PrintLabel_label.Text = "标签文件";
             // 
@@ -195,19 +195,19 @@
             // 
             this.PrinterList_label.AutoSize = true;
             this.PrinterList_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.PrinterList_label.Location = new System.Drawing.Point(680, 119);
+            this.PrinterList_label.Location = new System.Drawing.Point(604, 99);
             this.PrinterList_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.PrinterList_label.Name = "PrinterList_label";
-            this.PrinterList_label.Size = new System.Drawing.Size(134, 31);
+            this.PrinterList_label.Size = new System.Drawing.Size(112, 27);
             this.PrinterList_label.TabIndex = 173;
             this.PrinterList_label.Text = "打印机列表";
             // 
             // PrintNum
             // 
-            this.PrintNum.Location = new System.Drawing.Point(1243, 193);
-            this.PrintNum.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.PrintNum.Location = new System.Drawing.Point(1105, 161);
+            this.PrintNum.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.PrintNum.Name = "PrintNum";
-            this.PrintNum.Size = new System.Drawing.Size(220, 28);
+            this.PrintNum.Size = new System.Drawing.Size(196, 25);
             this.PrintNum.TabIndex = 175;
             this.PrintNum.Value = new decimal(new int[] {
             1,
@@ -217,10 +217,10 @@
             // 
             // PrinterList
             // 
-            this.PrinterList.Location = new System.Drawing.Point(845, 119);
-            this.PrinterList.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
+            this.PrinterList.Location = new System.Drawing.Point(751, 99);
+            this.PrinterList.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
             this.PrinterList.Name = "PrinterList";
-            this.PrinterList.Size = new System.Drawing.Size(219, 30);
+            this.PrinterList.Size = new System.Drawing.Size(195, 25);
             this.PrinterList.TabIndex = 171;
             // 
             // pa_prodcode
@@ -228,11 +228,11 @@
             this.pa_prodcode.AutoSize = true;
             this.pa_prodcode.CutLength = null;
             this.pa_prodcode.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pa_prodcode.Location = new System.Drawing.Point(838, 41);
+            this.pa_prodcode.Location = new System.Drawing.Point(745, 34);
             this.pa_prodcode.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.pa_prodcode.MaximumSize = new System.Drawing.Size(225, 0);
+            this.pa_prodcode.MaximumSize = new System.Drawing.Size(200, 0);
             this.pa_prodcode.Name = "pa_prodcode";
-            this.pa_prodcode.Size = new System.Drawing.Size(0, 31);
+            this.pa_prodcode.Size = new System.Drawing.Size(0, 27);
             this.pa_prodcode.TabIndex = 170;
             this.pa_prodcode.Tag = "1";
             // 
@@ -243,13 +243,13 @@
             this.Clean.DownImage = ((System.Drawing.Image)(resources.GetObject("Clean.DownImage")));
             this.Clean.Image = ((System.Drawing.Image)(resources.GetObject("Clean.Image")));
             this.Clean.IsShowBorder = true;
-            this.Clean.Location = new System.Drawing.Point(1243, 768);
-            this.Clean.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.Clean.Location = new System.Drawing.Point(1105, 640);
+            this.Clean.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.Clean.MoveImage = ((System.Drawing.Image)(resources.GetObject("Clean.MoveImage")));
             this.Clean.Name = "Clean";
             this.Clean.NormalImage = ((System.Drawing.Image)(resources.GetObject("Clean.NormalImage")));
             this.Clean.Power = null;
-            this.Clean.Size = new System.Drawing.Size(90, 36);
+            this.Clean.Size = new System.Drawing.Size(80, 30);
             this.Clean.TabIndex = 168;
             this.Clean.Text = "清除";
             this.Clean.UseVisualStyleBackColor = true;
@@ -258,10 +258,10 @@
             // OperateResult
             // 
             this.OperateResult.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.OperateResult.Location = new System.Drawing.Point(1072, 521);
-            this.OperateResult.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.OperateResult.Location = new System.Drawing.Point(953, 434);
+            this.OperateResult.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.OperateResult.Name = "OperateResult";
-            this.OperateResult.Size = new System.Drawing.Size(414, 237);
+            this.OperateResult.Size = new System.Drawing.Size(368, 198);
             this.OperateResult.TabIndex = 167;
             this.OperateResult.Text = "";
             // 
@@ -270,11 +270,11 @@
             this.outboxcode.AllPower = "ifall";
             this.outboxcode.BackColor = System.Drawing.Color.White;
             this.outboxcode.ID = null;
-            this.outboxcode.Location = new System.Drawing.Point(1243, 473);
-            this.outboxcode.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.outboxcode.Location = new System.Drawing.Point(1105, 394);
+            this.outboxcode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.outboxcode.Name = "outboxcode";
             this.outboxcode.Power = "ifwrite";
-            this.outboxcode.Size = new System.Drawing.Size(219, 28);
+            this.outboxcode.Size = new System.Drawing.Size(195, 25);
             this.outboxcode.Str = null;
             this.outboxcode.Str1 = null;
             this.outboxcode.Str2 = null;
@@ -287,11 +287,11 @@
             this.bigoutboxcode.AllPower = "ifall";
             this.bigoutboxcode.BackColor = System.Drawing.Color.White;
             this.bigoutboxcode.ID = null;
-            this.bigoutboxcode.Location = new System.Drawing.Point(1243, 407);
-            this.bigoutboxcode.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.bigoutboxcode.Location = new System.Drawing.Point(1105, 339);
+            this.bigoutboxcode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.bigoutboxcode.Name = "bigoutboxcode";
             this.bigoutboxcode.Power = "ifwrite";
-            this.bigoutboxcode.Size = new System.Drawing.Size(219, 28);
+            this.bigoutboxcode.Size = new System.Drawing.Size(195, 25);
             this.bigoutboxcode.Str = null;
             this.bigoutboxcode.Str1 = null;
             this.bigoutboxcode.Str2 = null;
@@ -306,13 +306,13 @@
             this.Printlab.DownImage = ((System.Drawing.Image)(resources.GetObject("Printlab.DownImage")));
             this.Printlab.Image = ((System.Drawing.Image)(resources.GetObject("Printlab.Image")));
             this.Printlab.IsShowBorder = true;
-            this.Printlab.Location = new System.Drawing.Point(1304, 295);
-            this.Printlab.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.Printlab.Location = new System.Drawing.Point(1159, 246);
+            this.Printlab.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.Printlab.MoveImage = ((System.Drawing.Image)(resources.GetObject("Printlab.MoveImage")));
             this.Printlab.Name = "Printlab";
             this.Printlab.NormalImage = ((System.Drawing.Image)(resources.GetObject("Printlab.NormalImage")));
             this.Printlab.Power = null;
-            this.Printlab.Size = new System.Drawing.Size(90, 36);
+            this.Printlab.Size = new System.Drawing.Size(80, 30);
             this.Printlab.TabIndex = 161;
             this.Printlab.Text = "打印";
             this.Printlab.UseVisualStyleBackColor = true;
@@ -325,13 +325,13 @@
             this.ReleasePallet.DownImage = ((System.Drawing.Image)(resources.GetObject("ReleasePallet.DownImage")));
             this.ReleasePallet.Image = ((System.Drawing.Image)(resources.GetObject("ReleasePallet.Image")));
             this.ReleasePallet.IsShowBorder = true;
-            this.ReleasePallet.Location = new System.Drawing.Point(1155, 349);
-            this.ReleasePallet.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.ReleasePallet.Location = new System.Drawing.Point(1027, 291);
+            this.ReleasePallet.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.ReleasePallet.MoveImage = ((System.Drawing.Image)(resources.GetObject("ReleasePallet.MoveImage")));
             this.ReleasePallet.Name = "ReleasePallet";
             this.ReleasePallet.NormalImage = ((System.Drawing.Image)(resources.GetObject("ReleasePallet.NormalImage")));
             this.ReleasePallet.Power = null;
-            this.ReleasePallet.Size = new System.Drawing.Size(90, 36);
+            this.ReleasePallet.Size = new System.Drawing.Size(80, 30);
             this.ReleasePallet.TabIndex = 160;
             this.ReleasePallet.Text = "解除大箱";
             this.ReleasePallet.UseVisualStyleBackColor = true;
@@ -344,13 +344,13 @@
             this.NewPallet.DownImage = ((System.Drawing.Image)(resources.GetObject("NewPallet.DownImage")));
             this.NewPallet.Image = ((System.Drawing.Image)(resources.GetObject("NewPallet.Image")));
             this.NewPallet.IsShowBorder = true;
-            this.NewPallet.Location = new System.Drawing.Point(1155, 295);
-            this.NewPallet.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.NewPallet.Location = new System.Drawing.Point(1027, 246);
+            this.NewPallet.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.NewPallet.MoveImage = ((System.Drawing.Image)(resources.GetObject("NewPallet.MoveImage")));
             this.NewPallet.Name = "NewPallet";
             this.NewPallet.NormalImage = ((System.Drawing.Image)(resources.GetObject("NewPallet.NormalImage")));
             this.NewPallet.Power = "ifwrite";
-            this.NewPallet.Size = new System.Drawing.Size(90, 36);
+            this.NewPallet.Size = new System.Drawing.Size(80, 30);
             this.NewPallet.TabIndex = 159;
             this.NewPallet.Text = "新增大箱";
             this.NewPallet.UseVisualStyleBackColor = true;
@@ -361,11 +361,11 @@
             this.pa_custcode.AutoSize = true;
             this.pa_custcode.CutLength = null;
             this.pa_custcode.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pa_custcode.Location = new System.Drawing.Point(1243, 41);
+            this.pa_custcode.Location = new System.Drawing.Point(1105, 34);
             this.pa_custcode.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.pa_custcode.MaximumSize = new System.Drawing.Size(225, 0);
+            this.pa_custcode.MaximumSize = new System.Drawing.Size(200, 0);
             this.pa_custcode.Name = "pa_custcode";
-            this.pa_custcode.Size = new System.Drawing.Size(0, 31);
+            this.pa_custcode.Size = new System.Drawing.Size(0, 27);
             this.pa_custcode.TabIndex = 158;
             this.pa_custcode.Tag = "1";
             // 
@@ -379,11 +379,11 @@
             this.Column3,
             this.Column4,
             this.Column5});
-            this.PackageInf.Location = new System.Drawing.Point(4, 193);
-            this.PackageInf.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.PackageInf.Location = new System.Drawing.Point(4, 161);
+            this.PackageInf.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.PackageInf.Name = "PackageInf";
             this.PackageInf.RowTemplate.Height = 23;
-            this.PackageInf.Size = new System.Drawing.Size(1059, 623);
+            this.PackageInf.Size = new System.Drawing.Size(941, 519);
             this.PackageInf.TabIndex = 156;
             // 
             // pd_outboxcode
@@ -427,61 +427,61 @@
             this.pa_makecode.AutoSize = true;
             this.pa_makecode.CutLength = null;
             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(494, 41);
+            this.pa_makecode.Location = new System.Drawing.Point(439, 34);
             this.pa_makecode.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.pa_makecode.MaximumSize = new System.Drawing.Size(225, 0);
+            this.pa_makecode.MaximumSize = new System.Drawing.Size(200, 0);
             this.pa_makecode.Name = "pa_makecode";
-            this.pa_makecode.Size = new System.Drawing.Size(0, 31);
+            this.pa_makecode.Size = new System.Drawing.Size(0, 27);
             this.pa_makecode.TabIndex = 109;
             this.pa_makecode.Tag = "1";
             // 
-            // pa_packageqty
+            // pa_standardqty
             // 
-            this.pa_packageqty.AutoSize = true;
-            this.pa_packageqty.CutLength = null;
-            this.pa_packageqty.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pa_packageqty.Location = new System.Drawing.Point(177, 115);
-            this.pa_packageqty.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.pa_packageqty.MaximumSize = new System.Drawing.Size(225, 0);
-            this.pa_packageqty.Name = "pa_packageqty";
-            this.pa_packageqty.Size = new System.Drawing.Size(0, 31);
-            this.pa_packageqty.TabIndex = 105;
-            this.pa_packageqty.Tag = "1";
+            this.pa_standardqty.AutoSize = true;
+            this.pa_standardqty.CutLength = null;
+            this.pa_standardqty.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.pa_standardqty.Location = new System.Drawing.Point(157, 96);
+            this.pa_standardqty.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.pa_standardqty.MaximumSize = new System.Drawing.Size(200, 0);
+            this.pa_standardqty.Name = "pa_standardqty";
+            this.pa_standardqty.Size = new System.Drawing.Size(0, 27);
+            this.pa_standardqty.TabIndex = 105;
+            this.pa_standardqty.Tag = "1";
             // 
             // pa_outboxcode
             // 
             this.pa_outboxcode.AutoSize = true;
             this.pa_outboxcode.CutLength = null;
             this.pa_outboxcode.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pa_outboxcode.Location = new System.Drawing.Point(177, 41);
+            this.pa_outboxcode.Location = new System.Drawing.Point(157, 34);
             this.pa_outboxcode.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.pa_outboxcode.MaximumSize = new System.Drawing.Size(225, 0);
+            this.pa_outboxcode.MaximumSize = new System.Drawing.Size(200, 0);
             this.pa_outboxcode.Name = "pa_outboxcode";
-            this.pa_outboxcode.Size = new System.Drawing.Size(0, 31);
+            this.pa_outboxcode.Size = new System.Drawing.Size(0, 27);
             this.pa_outboxcode.TabIndex = 103;
             this.pa_outboxcode.Tag = "1";
             // 
-            // pa_totalqty
+            // pa_currentqty
             // 
-            this.pa_totalqty.AutoSize = true;
-            this.pa_totalqty.CutLength = null;
-            this.pa_totalqty.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pa_totalqty.Location = new System.Drawing.Point(494, 119);
-            this.pa_totalqty.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.pa_totalqty.MaximumSize = new System.Drawing.Size(225, 0);
-            this.pa_totalqty.Name = "pa_totalqty";
-            this.pa_totalqty.Size = new System.Drawing.Size(0, 31);
-            this.pa_totalqty.TabIndex = 177;
-            this.pa_totalqty.Tag = "1";
+            this.pa_currentqty.AutoSize = true;
+            this.pa_currentqty.CutLength = null;
+            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(439, 99);
+            this.pa_currentqty.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.pa_currentqty.MaximumSize = new System.Drawing.Size(200, 0);
+            this.pa_currentqty.Name = "pa_currentqty";
+            this.pa_currentqty.Size = new System.Drawing.Size(0, 27);
+            this.pa_currentqty.TabIndex = 177;
+            this.pa_currentqty.Tag = "1";
             // 
             // pa_packageqty_label
             // 
             this.pa_packageqty_label.AutoSize = true;
             this.pa_packageqty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pa_packageqty_label.Location = new System.Drawing.Point(30, 115);
+            this.pa_packageqty_label.Location = new System.Drawing.Point(27, 96);
             this.pa_packageqty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pa_packageqty_label.Name = "pa_packageqty_label";
-            this.pa_packageqty_label.Size = new System.Drawing.Size(110, 31);
+            this.pa_packageqty_label.Size = new System.Drawing.Size(92, 27);
             this.pa_packageqty_label.TabIndex = 176;
             this.pa_packageqty_label.Text = "箱内容量";
             // 
@@ -492,13 +492,13 @@
             this.Packing.DownImage = ((System.Drawing.Image)(resources.GetObject("Packing.DownImage")));
             this.Packing.Image = ((System.Drawing.Image)(resources.GetObject("Packing.Image")));
             this.Packing.IsShowBorder = true;
-            this.Packing.Location = new System.Drawing.Point(1304, 349);
-            this.Packing.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.Packing.Location = new System.Drawing.Point(1159, 291);
+            this.Packing.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.Packing.MoveImage = ((System.Drawing.Image)(resources.GetObject("Packing.MoveImage")));
             this.Packing.Name = "Packing";
             this.Packing.NormalImage = ((System.Drawing.Image)(resources.GetObject("Packing.NormalImage")));
             this.Packing.Power = null;
-            this.Packing.Size = new System.Drawing.Size(90, 36);
+            this.Packing.Size = new System.Drawing.Size(80, 30);
             this.Packing.TabIndex = 178;
             this.Packing.Text = "装箱";
             this.Packing.UseVisualStyleBackColor = true;
@@ -506,11 +506,11 @@
             // 
             // Make_BigBoxCollection
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1495, 828);
+            this.ClientSize = new System.Drawing.Size(1329, 690);
             this.Controls.Add(this.Packing);
-            this.Controls.Add(this.pa_totalqty);
+            this.Controls.Add(this.pa_currentqty);
             this.Controls.Add(this.pa_packageqty_label);
             this.Controls.Add(this.PrintNum);
             this.Controls.Add(this.PrintLabel_label);
@@ -535,12 +535,12 @@
             this.Controls.Add(this.AutoPrint);
             this.Controls.Add(this.pa_makecode);
             this.Controls.Add(this.pa_makecode_label);
-            this.Controls.Add(this.pa_packageqty);
+            this.Controls.Add(this.pa_standardqty);
             this.Controls.Add(this.pa_totalqty_label);
             this.Controls.Add(this.pa_outboxcode);
             this.Controls.Add(this.pa_outboxcode_label);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
-            this.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.Name = "Make_BigBoxCollection";
             this.Tag = "Make!BigBoxCollection";
             this.Text = "栈板采集";
@@ -558,7 +558,7 @@
 
         private CustomControl.ValueLabel.ValueLabel pa_outboxcode;
         private System.Windows.Forms.Label pa_outboxcode_label;
-        private CustomControl.ValueLabel.ValueLabel pa_packageqty;
+        private CustomControl.ValueLabel.ValueLabel pa_standardqty;
         private System.Windows.Forms.Label pa_totalqty_label;
         private CustomControl.ValueLabel.ValueLabel pa_makecode;
         private System.Windows.Forms.Label pa_makecode_label;
@@ -588,7 +588,7 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn Column3;
         private System.Windows.Forms.DataGridViewTextBoxColumn Column4;
         private System.Windows.Forms.DataGridViewTextBoxColumn Column5;
-        private CustomControl.ValueLabel.ValueLabel pa_totalqty;
+        private CustomControl.ValueLabel.ValueLabel pa_currentqty;
         private System.Windows.Forms.Label pa_packageqty_label;
         private CustomControl.ButtonUtil.NormalButton Packing;
     }

UAS-MES/FunctionCode/Make/Make_BigBoxCollection.cs

@@ -31,8 +31,8 @@ namespace UAS_MES.Make
         string pa_type;
         //物料编号
         string pr_code;
-        //箱内件数
-        int pa_totqty;
+        //标准容量
+        int pa_stanqty;
         //Package表的主键
         string pa_id;
 
@@ -57,7 +57,7 @@ namespace UAS_MES.Make
             }
             catch
             {
-                MessageBox.Show("未正确安装CodeSoft软件");
+                OperateResult.AppendText("未正确安装CodeSoft软件",Color.Red);
             }
         }
 
@@ -87,15 +87,15 @@ namespace UAS_MES.Make
                     return;
                 }
                 sql.Clear();
-                sql.Append("select pa_makecode,pa_packageqty,pa_prodcode,pa_outboxcode,pa_totalqty,pa_custcode,pa_salecode ");
+                sql.Append("select pa_makecode,pa_standardqty,pa_packageqty,pa_prodcode,pa_outboxcode,pa_totalqty,pa_custcode,pa_salecode ");
                 sql.Append("from package where pa_outboxcode='" + bigoutboxcode.Text + "'  and pa_type =2");
                 dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
                 BaseUtil.SetFormValue(Controls, dt);
                 if (dt.Rows.Count > 0)
                 {
                     LoadGridData();
-                    dt = dh.getFieldsDataByCondition("Package", new string[] { "pa_totalqty", "pa_id" }, "pa_outboxcode='" + bigoutboxcode.Text + "'");
-                    pa_totqty = int.Parse(dt.Rows[0]["pa_totalqty"].ToString());
+                    dt = dh.getFieldsDataByCondition("Package", new string[] { "pa_id", "pa_standardqty" }, "pa_outboxcode='" + bigoutboxcode.Text + "'");
+                    pa_stanqty = int.Parse(dt.Rows[0]["pa_standardqty"].ToString());
                     pa_id = dt.Rows[0]["pa_id"].ToString();
                     FillPrintLabel();
                     outboxcode.Focus();
@@ -124,7 +124,7 @@ namespace UAS_MES.Make
                 sql.Append("pa_outboxcode='" + bigoutboxcode.Text + "'");
                 int packageqty = int.Parse((dh.ExecuteSql(sql.GetString(), "select") as DataTable).Rows[0][0].ToString());
                 //如果未装满的话
-                if (packageqty < pa_totqty)
+                if (packageqty < pa_stanqty)
                 {
                     if (dh.CheckExist("Package", "pa_outboxcode='" + outboxcode.Text + "' and nvl(pa_type,1)=1"))
                     {
@@ -136,7 +136,7 @@ namespace UAS_MES.Make
                             sql.Append("select packagedetail_seq.nextval,'" + pa_id + "','" + bigoutboxcode.Text + "','" + outboxcode.Text + "'");
                             sql.Append(",pa_packageqty from package where pa_outboxcode='" + outboxcode.Text + "'");
                             dh.ExecuteSql(sql.GetString(), "insert");
-                            dh.UpdateByCondition("package", "pa_packageqty=pa_packageqty+1", "pa_outboxcode='" + bigoutboxcode.Text + "' and pa_type=2");
+                            dh.UpdateByCondition("package", "PA_CURRENTQTY=PA_CURRENTQTY+1,PA_PACKAGEQTY=PA_PACKAGEQTY+1,PA_TOTALQTY=(select sum(pd_innerqty) from packagedetail left join package on pa_id=pd_paid where pa_outboxcode='" + bigoutboxcode.Text + "')", "pa_outboxcode='" + bigoutboxcode.Text + "' and pa_type=2");
                             if (dh.getFieldDataByCondition("package", "pa_makecode", "pa_outboxcode='" + bigoutboxcode.Text + "'").ToString() == "")
                             {
                                 string carton_macode = dh.getFieldDataByCondition("package", "pa_makecode", "pa_outboxcode='" + outboxcode.Text + "'").ToString();
@@ -147,7 +147,7 @@ namespace UAS_MES.Make
                             LoadGridData();
                             LoadCollectNum();
                             //判断明细和箱内的件数的差是不是1，如果只相差1则表示此时已经采集慢了
-                            if (packageqty + 1 == pa_totqty)
+                            if (packageqty + 1 == pa_stanqty)
                             {
                                 if (AutoPrint.Checked)
                                 {
@@ -193,7 +193,7 @@ namespace UAS_MES.Make
 
         private void LoadCollectNum()
         {
-            pa_packageqty.Text = dh.getFieldDataByCondition("package", "pa_packageqty", "pa_outboxcode='" + bigoutboxcode.Text + "' and pa_type=2").ToString();
+            pa_currentqty.Text = dh.getFieldDataByCondition("package", "PA_CURRENTQTY", "pa_outboxcode='" + bigoutboxcode.Text + "' and pa_type=2").ToString();
         }
 
         private void 栈板称重_SizeChanged(object sender, EventArgs e)
@@ -244,11 +244,11 @@ namespace UAS_MES.Make
         {
             if (pa_prodcode.Text != "" && bigoutboxcode.Text != "")
             {
-                OperateResult.AppendText(">>" + bigoutboxcode.Text + "装箱成功\n", Color.Red);
+                OperateResult.AppendText(">>" + bigoutboxcode.Text + "装箱成功\n", Color.Green);
                 bigoutboxcode.Text = LogicHandler.GetOutBoxCode("PACKAGE", "", pa_prodcode.Text, User.UserCode);
                 sql.Clear();
-                sql.Append("insert into package (pa_id,pa_outboxcode,pa_makecode,pa_indate,pa_packageqty,pa_type,pa_prodcode，pa_level，PA_STATUS,pa_totalqty)values");
-                sql.Append("(package_seq.nextval,'" + bigoutboxcode.Text + "','" + pa_makecode.Text + "',sysdate,'0',2,'" + pa_prodcode.Text + "',0,'','" + pa_totalqty.Text + "')");
+                sql.Append("insert into package (pa_id,pa_outboxcode,pa_makecode,pa_indate,pa_packageqty,pa_type,pa_prodcode，pa_level，PA_STATUS,pa_standardqty)values");
+                sql.Append("(package_seq.nextval,'" + bigoutboxcode.Text + "','" + pa_makecode.Text + "',sysdate,'0',2,'" + pa_prodcode.Text + "',0,'','" + pa_standardqty.Text + "')");
                 dh.ExecuteSql(sql.GetString(), "insert");
                 palletcode_KeyDown(new object(), new KeyEventArgs(Keys.Enter));
             }

UAS-MES/FunctionCode/Make/Make_BigBoxWeight.Designer.cs

@@ -45,7 +45,6 @@
             this.PrintLabel = new System.Windows.Forms.ComboBox();
             this.PrintNum = new System.Windows.Forms.NumericUpDown();
             this.label6 = new System.Windows.Forms.Label();
-            this.autoprint = new System.Windows.Forms.CheckBox();
             this.showResult = new System.Windows.Forms.ListView();
             this.columnHeader1 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
             this.箱号 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
@@ -65,6 +64,7 @@
             this.OperateResult = new UAS_MES.CustomControl.RichText.RichTextAutoBottom();
             this.Printer = new UAS_MES.CustomControl.ComBoxWithFocus.PrinterCombox();
             this.pa_outboxcode = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.autoprint = new UAS_MES.CustomControl.CustomCheckBox.AutoPrintCheckBox();
             this.panel4.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.PrintNum)).BeginInit();
             this.SuspendLayout();
@@ -73,9 +73,10 @@
             // 
             this.label15.AutoSize = true;
             this.label15.Font = new System.Drawing.Font("微软雅黑", 18F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label15.Location = new System.Drawing.Point(22, 14);
+            this.label15.Location = new System.Drawing.Point(29, 18);
+            this.label15.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label15.Name = "label15";
-            this.label15.Size = new System.Drawing.Size(86, 31);
+            this.label15.Size = new System.Drawing.Size(107, 39);
             this.label15.TabIndex = 57;
             this.label15.Text = "大箱号";
             // 
@@ -85,10 +86,10 @@
             this.panel4.Controls.Add(this.pr_colorboxunit);
             this.panel4.Controls.Add(this.label22);
             this.panel4.Controls.Add(this.weight);
-            this.panel4.Location = new System.Drawing.Point(28, 68);
-            this.panel4.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.panel4.Location = new System.Drawing.Point(37, 85);
+            this.panel4.Margin = new System.Windows.Forms.Padding(4, 2, 4, 2);
             this.panel4.Name = "panel4";
-            this.panel4.Size = new System.Drawing.Size(429, 79);
+            this.panel4.Size = new System.Drawing.Size(571, 98);
             this.panel4.TabIndex = 64;
             // 
             // pr_colorboxunit
@@ -97,9 +98,10 @@
             this.pr_colorboxunit.BackColor = System.Drawing.SystemColors.ActiveCaptionText;
             this.pr_colorboxunit.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.pr_colorboxunit.ForeColor = System.Drawing.SystemColors.ControlLightLight;
-            this.pr_colorboxunit.Location = new System.Drawing.Point(384, 28);
+            this.pr_colorboxunit.Location = new System.Drawing.Point(512, 35);
+            this.pr_colorboxunit.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pr_colorboxunit.Name = "pr_colorboxunit";
-            this.pr_colorboxunit.Size = new System.Drawing.Size(31, 25);
+            this.pr_colorboxunit.Size = new System.Drawing.Size(38, 31);
             this.pr_colorboxunit.TabIndex = 42;
             this.pr_colorboxunit.Text = "克";
             // 
@@ -109,9 +111,10 @@
             this.label22.BackColor = System.Drawing.SystemColors.ActiveCaptionText;
             this.label22.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.label22.ForeColor = System.Drawing.SystemColors.ControlLightLight;
-            this.label22.Location = new System.Drawing.Point(13, 28);
+            this.label22.Location = new System.Drawing.Point(17, 35);
+            this.label22.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label22.Name = "label22";
-            this.label22.Size = new System.Drawing.Size(50, 25);
+            this.label22.Size = new System.Drawing.Size(62, 31);
             this.label22.TabIndex = 20;
             this.label22.Text = "重量";
             // 
@@ -120,18 +123,20 @@
             this.weight.AutoSize = true;
             this.weight.Font = new System.Drawing.Font("微软雅黑", 25.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.weight.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(0)))));
-            this.weight.Location = new System.Drawing.Point(95, 18);
+            this.weight.Location = new System.Drawing.Point(127, 22);
+            this.weight.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.weight.Name = "weight";
-            this.weight.Size = new System.Drawing.Size(0, 46);
+            this.weight.Size = new System.Drawing.Size(0, 57);
             this.weight.TabIndex = 41;
             // 
             // pa_makecode_label
             // 
             this.pa_makecode_label.AutoSize = true;
             this.pa_makecode_label.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pa_makecode_label.Location = new System.Drawing.Point(34, 166);
+            this.pa_makecode_label.Location = new System.Drawing.Point(45, 208);
+            this.pa_makecode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pa_makecode_label.Name = "pa_makecode_label";
-            this.pa_makecode_label.Size = new System.Drawing.Size(72, 27);
+            this.pa_makecode_label.Size = new System.Drawing.Size(90, 32);
             this.pa_makecode_label.TabIndex = 73;
             this.pa_makecode_label.Text = "工单号";
             // 
@@ -139,9 +144,10 @@
             // 
             this.PA_TOTALQTY_label.AutoSize = true;
             this.PA_TOTALQTY_label.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.PA_TOTALQTY_label.Location = new System.Drawing.Point(34, 226);
+            this.PA_TOTALQTY_label.Location = new System.Drawing.Point(45, 282);
+            this.PA_TOTALQTY_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.PA_TOTALQTY_label.Name = "PA_TOTALQTY_label";
-            this.PA_TOTALQTY_label.Size = new System.Drawing.Size(92, 27);
+            this.PA_TOTALQTY_label.Size = new System.Drawing.Size(115, 32);
             this.PA_TOTALQTY_label.TabIndex = 74;
             this.PA_TOTALQTY_label.Text = "箱内总数";
             // 
@@ -149,9 +155,10 @@
             // 
             this.label2.AutoSize = true;
             this.label2.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label2.Location = new System.Drawing.Point(34, 286);
+            this.label2.Location = new System.Drawing.Point(45, 358);
+            this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(92, 27);
+            this.label2.Size = new System.Drawing.Size(115, 32);
             this.label2.TabIndex = 75;
             this.label2.Text = "产品编号";
             // 
@@ -159,9 +166,10 @@
             // 
             this.pr_detail_label.AutoSize = true;
             this.pr_detail_label.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_detail_label.Location = new System.Drawing.Point(34, 339);
+            this.pr_detail_label.Location = new System.Drawing.Point(45, 424);
+            this.pr_detail_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pr_detail_label.Name = "pr_detail_label";
-            this.pr_detail_label.Size = new System.Drawing.Size(92, 27);
+            this.pr_detail_label.Size = new System.Drawing.Size(115, 32);
             this.pr_detail_label.TabIndex = 76;
             this.pr_detail_label.Text = "名称规格";
             // 
@@ -169,9 +177,10 @@
             // 
             this.pa_salecode_label.AutoSize = true;
             this.pa_salecode_label.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pa_salecode_label.Location = new System.Drawing.Point(243, 166);
+            this.pa_salecode_label.Location = new System.Drawing.Point(324, 208);
+            this.pa_salecode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pa_salecode_label.Name = "pa_salecode_label";
-            this.pa_salecode_label.Size = new System.Drawing.Size(92, 27);
+            this.pa_salecode_label.Size = new System.Drawing.Size(115, 32);
             this.pa_salecode_label.TabIndex = 77;
             this.pa_salecode_label.Text = "订单编号";
             // 
@@ -179,9 +188,10 @@
             // 
             this.PA_PACKAGEQTY_label.AutoSize = true;
             this.PA_PACKAGEQTY_label.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.PA_PACKAGEQTY_label.Location = new System.Drawing.Point(243, 226);
+            this.PA_PACKAGEQTY_label.Location = new System.Drawing.Point(324, 282);
+            this.PA_PACKAGEQTY_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.PA_PACKAGEQTY_label.Name = "PA_PACKAGEQTY_label";
-            this.PA_PACKAGEQTY_label.Size = new System.Drawing.Size(92, 27);
+            this.PA_PACKAGEQTY_label.Size = new System.Drawing.Size(115, 32);
             this.PA_PACKAGEQTY_label.TabIndex = 78;
             this.PA_PACKAGEQTY_label.Text = "箱内件数";
             // 
@@ -189,9 +199,10 @@
             // 
             this.PrintLabel_label.AutoSize = true;
             this.PrintLabel_label.Font = new System.Drawing.Font("微软雅黑", 10.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.PrintLabel_label.Location = new System.Drawing.Point(659, 54);
+            this.PrintLabel_label.Location = new System.Drawing.Point(879, 68);
+            this.PrintLabel_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.PrintLabel_label.Name = "PrintLabel_label";
-            this.PrintLabel_label.Size = new System.Drawing.Size(69, 20);
+            this.PrintLabel_label.Size = new System.Drawing.Size(88, 25);
             this.PrintLabel_label.TabIndex = 169;
             this.PrintLabel_label.Text = "打印标签";
             // 
@@ -199,9 +210,10 @@
             // 
             this.Printer_label.AutoSize = true;
             this.Printer_label.Font = new System.Drawing.Font("微软雅黑", 10.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.Printer_label.Location = new System.Drawing.Point(659, 20);
+            this.Printer_label.Location = new System.Drawing.Point(879, 25);
+            this.Printer_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.Printer_label.Name = "Printer_label";
-            this.Printer_label.Size = new System.Drawing.Size(84, 20);
+            this.Printer_label.Size = new System.Drawing.Size(107, 25);
             this.Printer_label.TabIndex = 168;
             this.Printer_label.Text = "打印机列表";
             // 
@@ -209,17 +221,18 @@
             // 
             this.PrintLabel.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.PrintLabel.FormattingEnabled = true;
-            this.PrintLabel.Location = new System.Drawing.Point(764, 54);
-            this.PrintLabel.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.PrintLabel.Location = new System.Drawing.Point(1019, 68);
+            this.PrintLabel.Margin = new System.Windows.Forms.Padding(4, 2, 4, 2);
             this.PrintLabel.Name = "PrintLabel";
-            this.PrintLabel.Size = new System.Drawing.Size(120, 20);
+            this.PrintLabel.Size = new System.Drawing.Size(159, 23);
             this.PrintLabel.TabIndex = 166;
             // 
             // PrintNum
             // 
-            this.PrintNum.Location = new System.Drawing.Point(764, 86);
+            this.PrintNum.Location = new System.Drawing.Point(1019, 108);
+            this.PrintNum.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.PrintNum.Name = "PrintNum";
-            this.PrintNum.Size = new System.Drawing.Size(119, 21);
+            this.PrintNum.Size = new System.Drawing.Size(159, 25);
             this.PrintNum.TabIndex = 174;
             this.PrintNum.Value = new decimal(new int[] {
             1,
@@ -231,25 +244,13 @@
             // 
             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(659, 86);
+            this.label6.Location = new System.Drawing.Point(879, 108);
+            this.label6.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label6.Name = "label6";
-            this.label6.Size = new System.Drawing.Size(74, 21);
+            this.label6.Size = new System.Drawing.Size(92, 27);
             this.label6.TabIndex = 173;
             this.label6.Text = "打印张数";
             // 
-            // autoprint
-            // 
-            this.autoprint.AutoSize = true;
-            this.autoprint.Checked = true;
-            this.autoprint.CheckState = System.Windows.Forms.CheckState.Checked;
-            this.autoprint.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.autoprint.Location = new System.Drawing.Point(663, 119);
-            this.autoprint.Name = "autoprint";
-            this.autoprint.Size = new System.Drawing.Size(75, 21);
-            this.autoprint.TabIndex = 175;
-            this.autoprint.Text = "自动打印";
-            this.autoprint.UseVisualStyleBackColor = true;
-            // 
             // showResult
             // 
             this.showResult.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
@@ -257,9 +258,10 @@
             this.箱号,
             this.重量,
             this.称重时间});
-            this.showResult.Location = new System.Drawing.Point(481, 169);
+            this.showResult.Location = new System.Drawing.Point(641, 211);
+            this.showResult.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.showResult.Name = "showResult";
-            this.showResult.Size = new System.Drawing.Size(404, 374);
+            this.showResult.Size = new System.Drawing.Size(537, 466);
             this.showResult.TabIndex = 188;
             this.showResult.UseCompatibleStateImageBehavior = false;
             this.showResult.View = System.Windows.Forms.View.Details;
@@ -288,9 +290,10 @@
             // 
             this.已称.AutoSize = true;
             this.已称.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.已称.Location = new System.Drawing.Point(480, 127);
+            this.已称.Location = new System.Drawing.Point(640, 159);
+            this.已称.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.已称.Name = "已称";
-            this.已称.Size = new System.Drawing.Size(58, 21);
+            this.已称.Size = new System.Drawing.Size(72, 27);
             this.已称.TabIndex = 184;
             this.已称.Text = "已打印";
             // 
@@ -299,12 +302,12 @@
             this.BaudRate.AllPower = null;
             this.BaudRate.BackColor = System.Drawing.Color.White;
             this.BaudRate.ID = null;
-            this.BaudRate.Location = new System.Drawing.Point(532, 79);
-            this.BaudRate.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.BaudRate.Location = new System.Drawing.Point(709, 99);
+            this.BaudRate.Margin = new System.Windows.Forms.Padding(4, 2, 4, 2);
             this.BaudRate.Name = "BaudRate";
             this.BaudRate.Negative = false;
             this.BaudRate.Power = null;
-            this.BaudRate.Size = new System.Drawing.Size(120, 21);
+            this.BaudRate.Size = new System.Drawing.Size(159, 25);
             this.BaudRate.Str = null;
             this.BaudRate.Str1 = null;
             this.BaudRate.Str2 = null;
@@ -316,10 +319,11 @@
             this.weightsum.AutoSize = true;
             this.weightsum.CutLength = null;
             this.weightsum.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.weightsum.Location = new System.Drawing.Point(540, 123);
-            this.weightsum.MaximumSize = new System.Drawing.Size(150, 0);
+            this.weightsum.Location = new System.Drawing.Point(720, 154);
+            this.weightsum.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.weightsum.MaximumSize = new System.Drawing.Size(200, 0);
             this.weightsum.Name = "weightsum";
-            this.weightsum.Size = new System.Drawing.Size(0, 27);
+            this.weightsum.Size = new System.Drawing.Size(0, 32);
             this.weightsum.TabIndex = 185;
             this.weightsum.Tag = "1";
             // 
@@ -328,10 +332,11 @@
             this.pa_packageqty.AutoSize = true;
             this.pa_packageqty.CutLength = null;
             this.pa_packageqty.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pa_packageqty.Location = new System.Drawing.Point(343, 226);
-            this.pa_packageqty.MaximumSize = new System.Drawing.Size(150, 0);
+            this.pa_packageqty.Location = new System.Drawing.Point(457, 282);
+            this.pa_packageqty.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.pa_packageqty.MaximumSize = new System.Drawing.Size(200, 0);
             this.pa_packageqty.Name = "pa_packageqty";
-            this.pa_packageqty.Size = new System.Drawing.Size(0, 27);
+            this.pa_packageqty.Size = new System.Drawing.Size(0, 32);
             this.pa_packageqty.TabIndex = 183;
             this.pa_packageqty.Tag = "1";
             // 
@@ -340,10 +345,11 @@
             this.pa_salecode.AutoSize = true;
             this.pa_salecode.CutLength = null;
             this.pa_salecode.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pa_salecode.Location = new System.Drawing.Point(343, 166);
-            this.pa_salecode.MaximumSize = new System.Drawing.Size(150, 0);
+            this.pa_salecode.Location = new System.Drawing.Point(457, 208);
+            this.pa_salecode.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.pa_salecode.MaximumSize = new System.Drawing.Size(200, 0);
             this.pa_salecode.Name = "pa_salecode";
-            this.pa_salecode.Size = new System.Drawing.Size(0, 27);
+            this.pa_salecode.Size = new System.Drawing.Size(0, 32);
             this.pa_salecode.TabIndex = 182;
             this.pa_salecode.Tag = "1";
             // 
@@ -352,10 +358,11 @@
             this.pr_detail.AutoSize = true;
             this.pr_detail.CutLength = null;
             this.pr_detail.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_detail.Location = new System.Drawing.Point(126, 340);
-            this.pr_detail.MaximumSize = new System.Drawing.Size(150, 0);
+            this.pr_detail.Location = new System.Drawing.Point(168, 425);
+            this.pr_detail.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.pr_detail.MaximumSize = new System.Drawing.Size(200, 0);
             this.pr_detail.Name = "pr_detail";
-            this.pr_detail.Size = new System.Drawing.Size(0, 27);
+            this.pr_detail.Size = new System.Drawing.Size(0, 32);
             this.pr_detail.TabIndex = 181;
             this.pr_detail.Tag = "1";
             // 
@@ -364,10 +371,11 @@
             this.pa_prodcode.AutoSize = true;
             this.pa_prodcode.CutLength = null;
             this.pa_prodcode.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pa_prodcode.Location = new System.Drawing.Point(126, 286);
-            this.pa_prodcode.MaximumSize = new System.Drawing.Size(150, 0);
+            this.pa_prodcode.Location = new System.Drawing.Point(168, 358);
+            this.pa_prodcode.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.pa_prodcode.MaximumSize = new System.Drawing.Size(200, 0);
             this.pa_prodcode.Name = "pa_prodcode";
-            this.pa_prodcode.Size = new System.Drawing.Size(0, 27);
+            this.pa_prodcode.Size = new System.Drawing.Size(0, 32);
             this.pa_prodcode.TabIndex = 180;
             this.pa_prodcode.Tag = "1";
             this.pa_prodcode.TextChanged += new System.EventHandler(this.pa_prodcode_TextChanged);
@@ -377,10 +385,11 @@
             this.pa_totalqty.AutoSize = true;
             this.pa_totalqty.CutLength = null;
             this.pa_totalqty.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pa_totalqty.Location = new System.Drawing.Point(126, 229);
-            this.pa_totalqty.MaximumSize = new System.Drawing.Size(150, 0);
+            this.pa_totalqty.Location = new System.Drawing.Point(168, 286);
+            this.pa_totalqty.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.pa_totalqty.MaximumSize = new System.Drawing.Size(200, 0);
             this.pa_totalqty.Name = "pa_totalqty";
-            this.pa_totalqty.Size = new System.Drawing.Size(0, 27);
+            this.pa_totalqty.Size = new System.Drawing.Size(0, 32);
             this.pa_totalqty.TabIndex = 179;
             this.pa_totalqty.Tag = "1";
             // 
@@ -389,10 +398,11 @@
             this.pa_makecode.AutoSize = true;
             this.pa_makecode.CutLength = null;
             this.pa_makecode.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pa_makecode.Location = new System.Drawing.Point(124, 169);
-            this.pa_makecode.MaximumSize = new System.Drawing.Size(150, 0);
+            this.pa_makecode.Location = new System.Drawing.Point(165, 211);
+            this.pa_makecode.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.pa_makecode.MaximumSize = new System.Drawing.Size(200, 0);
             this.pa_makecode.Name = "pa_makecode";
-            this.pa_makecode.Size = new System.Drawing.Size(0, 27);
+            this.pa_makecode.Size = new System.Drawing.Size(0, 32);
             this.pa_makecode.TabIndex = 178;
             this.pa_makecode.Tag = "1";
             // 
@@ -403,12 +413,13 @@
             this.StartWeight.DownImage = ((System.Drawing.Image)(resources.GetObject("StartWeight.DownImage")));
             this.StartWeight.Image = ((System.Drawing.Image)(resources.GetObject("StartWeight.Image")));
             this.StartWeight.IsShowBorder = true;
-            this.StartWeight.Location = new System.Drawing.Point(481, 14);
+            this.StartWeight.Location = new System.Drawing.Point(641, 18);
+            this.StartWeight.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.StartWeight.MoveImage = ((System.Drawing.Image)(resources.GetObject("StartWeight.MoveImage")));
             this.StartWeight.Name = "StartWeight";
             this.StartWeight.NormalImage = ((System.Drawing.Image)(resources.GetObject("StartWeight.NormalImage")));
             this.StartWeight.Power = null;
-            this.StartWeight.Size = new System.Drawing.Size(75, 24);
+            this.StartWeight.Size = new System.Drawing.Size(100, 30);
             this.StartWeight.TabIndex = 177;
             this.StartWeight.Text = "开始称量";
             this.StartWeight.UseVisualStyleBackColor = true;
@@ -421,12 +432,13 @@
             this.StopWeight.DownImage = ((System.Drawing.Image)(resources.GetObject("StopWeight.DownImage")));
             this.StopWeight.Image = ((System.Drawing.Image)(resources.GetObject("StopWeight.Image")));
             this.StopWeight.IsShowBorder = true;
-            this.StopWeight.Location = new System.Drawing.Point(576, 14);
+            this.StopWeight.Location = new System.Drawing.Point(768, 18);
+            this.StopWeight.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.StopWeight.MoveImage = ((System.Drawing.Image)(resources.GetObject("StopWeight.MoveImage")));
             this.StopWeight.Name = "StopWeight";
             this.StopWeight.NormalImage = ((System.Drawing.Image)(resources.GetObject("StopWeight.NormalImage")));
             this.StopWeight.Power = null;
-            this.StopWeight.Size = new System.Drawing.Size(75, 24);
+            this.StopWeight.Size = new System.Drawing.Size(100, 30);
             this.StopWeight.TabIndex = 176;
             this.StopWeight.Text = "停止称量";
             this.StopWeight.UseVisualStyleBackColor = true;
@@ -435,18 +447,19 @@
             // OperateResult
             // 
             this.OperateResult.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.OperateResult.Location = new System.Drawing.Point(28, 378);
+            this.OperateResult.Location = new System.Drawing.Point(37, 472);
+            this.OperateResult.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.OperateResult.Name = "OperateResult";
-            this.OperateResult.Size = new System.Drawing.Size(431, 164);
+            this.OperateResult.Size = new System.Drawing.Size(573, 204);
             this.OperateResult.TabIndex = 171;
             this.OperateResult.Text = "";
             // 
             // Printer
             // 
-            this.Printer.Location = new System.Drawing.Point(764, 20);
-            this.Printer.Margin = new System.Windows.Forms.Padding(4);
+            this.Printer.Location = new System.Drawing.Point(1019, 25);
+            this.Printer.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
             this.Printer.Name = "Printer";
-            this.Printer.Size = new System.Drawing.Size(119, 20);
+            this.Printer.Size = new System.Drawing.Size(159, 25);
             this.Printer.TabIndex = 167;
             // 
             // pa_outboxcode
@@ -455,22 +468,31 @@
             this.pa_outboxcode.BackColor = System.Drawing.Color.White;
             this.pa_outboxcode.Font = new System.Drawing.Font("微软雅黑", 18F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.pa_outboxcode.ID = null;
-            this.pa_outboxcode.Location = new System.Drawing.Point(132, 14);
-            this.pa_outboxcode.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.pa_outboxcode.Location = new System.Drawing.Point(176, 18);
+            this.pa_outboxcode.Margin = new System.Windows.Forms.Padding(4, 2, 4, 2);
             this.pa_outboxcode.Name = "pa_outboxcode";
             this.pa_outboxcode.Power = "ifwrite";
-            this.pa_outboxcode.Size = new System.Drawing.Size(325, 39);
+            this.pa_outboxcode.Size = new System.Drawing.Size(432, 47);
             this.pa_outboxcode.Str = null;
             this.pa_outboxcode.Str1 = null;
             this.pa_outboxcode.Str2 = null;
             this.pa_outboxcode.TabIndex = 58;
             this.pa_outboxcode.KeyDown += new System.Windows.Forms.KeyEventHandler(this.pa_outboxcode_KeyDown);
             // 
+            // autoprint
+            // 
+            this.autoprint.Checked = false;
+            this.autoprint.Location = new System.Drawing.Point(884, 152);
+            this.autoprint.Name = "autoprint";
+            this.autoprint.Size = new System.Drawing.Size(125, 34);
+            this.autoprint.TabIndex = 189;
+            // 
             // Make_BigBoxWeight
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(910, 552);
+            this.ClientSize = new System.Drawing.Size(1213, 690);
+            this.Controls.Add(this.autoprint);
             this.Controls.Add(this.showResult);
             this.Controls.Add(this.BaudRate);
             this.Controls.Add(this.weightsum);
@@ -483,7 +505,6 @@
             this.Controls.Add(this.pa_makecode);
             this.Controls.Add(this.StartWeight);
             this.Controls.Add(this.StopWeight);
-            this.Controls.Add(this.autoprint);
             this.Controls.Add(this.PrintNum);
             this.Controls.Add(this.label6);
             this.Controls.Add(this.OperateResult);
@@ -501,6 +522,7 @@
             this.Controls.Add(this.pa_outboxcode);
             this.Controls.Add(this.label15);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
+            this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.Name = "Make_BigBoxWeight";
             this.Tag = "Make!BigBoxWeigh";
             this.Text = "大箱称重";
@@ -536,7 +558,6 @@
         private CustomControl.RichText.RichTextAutoBottom OperateResult;
         private System.Windows.Forms.NumericUpDown PrintNum;
         private System.Windows.Forms.Label label6;
-        private System.Windows.Forms.CheckBox autoprint;
         private CustomControl.ButtonUtil.NormalButton StartWeight;
         private CustomControl.ButtonUtil.NormalButton StopWeight;
         private CustomControl.ValueLabel.ValueLabel pa_makecode;
@@ -553,5 +574,6 @@
         private System.Windows.Forms.ColumnHeader columnHeader1;
         private CustomControl.ValueLabel.ValueLabel weightsum;
         private System.Windows.Forms.Label 已称;
+        private CustomControl.CustomCheckBox.AutoPrintCheckBox autoprint;
     }
 }

UAS-MES/FunctionCode/Make/Make_CartonBoxWeigh.Designer.cs

@@ -46,7 +46,6 @@
             this.PrintLabel = new System.Windows.Forms.ComboBox();
             this.Printer_label = new System.Windows.Forms.Label();
             this.label1 = new System.Windows.Forms.Label();
-            this.AutoPrint = new System.Windows.Forms.CheckBox();
             this.PrintNum = new System.Windows.Forms.NumericUpDown();
             this.label2 = new System.Windows.Forms.Label();
             this.ComList = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
@@ -69,6 +68,7 @@
             this.columnHeader2 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
             this.columnHeader3 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
             this.columnHeader4 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
+            this.AutoPrint = new UAS_MES.CustomControl.CustomCheckBox.AutoPrintCheckBox();
             this.panel6.SuspendLayout();
             this.panel4.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.PrintNum)).BeginInit();
@@ -78,10 +78,10 @@
             // 
             this.ma_code_label.AutoSize = true;
             this.ma_code_label.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ma_code_label.Location = new System.Drawing.Point(46, 362);
+            this.ma_code_label.Location = new System.Drawing.Point(41, 302);
             this.ma_code_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ma_code_label.Name = "ma_code_label";
-            this.ma_code_label.Size = new System.Drawing.Size(137, 39);
+            this.ma_code_label.Size = new System.Drawing.Size(115, 32);
             this.ma_code_label.TabIndex = 97;
             this.ma_code_label.Text = "制造单号";
             // 
@@ -92,10 +92,10 @@
             this.panel6.Controls.Add(this.pr_code);
             this.panel6.Controls.Add(this.pr_cartongw_label);
             this.panel6.Controls.Add(this.pr_code_label);
-            this.panel6.Location = new System.Drawing.Point(633, 114);
-            this.panel6.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.panel6.Location = new System.Drawing.Point(563, 95);
+            this.panel6.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.panel6.Name = "panel6";
-            this.panel6.Size = new System.Drawing.Size(604, 187);
+            this.panel6.Size = new System.Drawing.Size(537, 156);
             this.panel6.TabIndex = 90;
             // 
             // pr_cartongw
@@ -103,11 +103,11 @@
             this.pr_cartongw.AutoSize = true;
             this.pr_cartongw.CutLength = null;
             this.pr_cartongw.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_cartongw.Location = new System.Drawing.Point(231, 109);
+            this.pr_cartongw.Location = new System.Drawing.Point(205, 91);
             this.pr_cartongw.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.pr_cartongw.MaximumSize = new System.Drawing.Size(225, 0);
+            this.pr_cartongw.MaximumSize = new System.Drawing.Size(200, 0);
             this.pr_cartongw.Name = "pr_cartongw";
-            this.pr_cartongw.Size = new System.Drawing.Size(0, 39);
+            this.pr_cartongw.Size = new System.Drawing.Size(0, 32);
             this.pr_cartongw.TabIndex = 80;
             this.pr_cartongw.Tag = "1";
             // 
@@ -116,11 +116,11 @@
             this.pr_code.AutoSize = true;
             this.pr_code.CutLength = null;
             this.pr_code.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_code.Location = new System.Drawing.Point(231, 34);
+            this.pr_code.Location = new System.Drawing.Point(205, 28);
             this.pr_code.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.pr_code.MaximumSize = new System.Drawing.Size(225, 0);
+            this.pr_code.MaximumSize = new System.Drawing.Size(200, 0);
             this.pr_code.Name = "pr_code";
-            this.pr_code.Size = new System.Drawing.Size(0, 39);
+            this.pr_code.Size = new System.Drawing.Size(0, 32);
             this.pr_code.TabIndex = 79;
             this.pr_code.Tag = "1";
             this.pr_code.TextChanged += new System.EventHandler(this.pr_code_TextChanged);
@@ -129,10 +129,10 @@
             // 
             this.pr_cartongw_label.AutoSize = true;
             this.pr_cartongw_label.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_cartongw_label.Location = new System.Drawing.Point(42, 109);
+            this.pr_cartongw_label.Location = new System.Drawing.Point(37, 91);
             this.pr_cartongw_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pr_cartongw_label.Name = "pr_cartongw_label";
-            this.pr_cartongw_label.Size = new System.Drawing.Size(137, 39);
+            this.pr_cartongw_label.Size = new System.Drawing.Size(115, 32);
             this.pr_cartongw_label.TabIndex = 42;
             this.pr_cartongw_label.Text = "标准重量";
             // 
@@ -140,10 +140,10 @@
             // 
             this.pr_code_label.AutoSize = true;
             this.pr_code_label.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_code_label.Location = new System.Drawing.Point(40, 34);
+            this.pr_code_label.Location = new System.Drawing.Point(36, 28);
             this.pr_code_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pr_code_label.Name = "pr_code_label";
-            this.pr_code_label.Size = new System.Drawing.Size(137, 39);
+            this.pr_code_label.Size = new System.Drawing.Size(115, 32);
             this.pr_code_label.TabIndex = 40;
             this.pr_code_label.Text = "产品编号";
             // 
@@ -153,10 +153,10 @@
             this.panel4.Controls.Add(this.pr_cartonunit);
             this.panel4.Controls.Add(this.label22);
             this.panel4.Controls.Add(this.weight);
-            this.panel4.Location = new System.Drawing.Point(37, 114);
-            this.panel4.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.panel4.Location = new System.Drawing.Point(33, 95);
+            this.panel4.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.panel4.Name = "panel4";
-            this.panel4.Size = new System.Drawing.Size(557, 187);
+            this.panel4.Size = new System.Drawing.Size(495, 156);
             this.panel4.TabIndex = 91;
             // 
             // pr_cartonunit
@@ -165,10 +165,10 @@
             this.pr_cartonunit.BackColor = System.Drawing.SystemColors.ActiveCaptionText;
             this.pr_cartonunit.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.pr_cartonunit.ForeColor = System.Drawing.SystemColors.ControlLightLight;
-            this.pr_cartonunit.Location = new System.Drawing.Point(460, 77);
+            this.pr_cartonunit.Location = new System.Drawing.Point(409, 64);
             this.pr_cartonunit.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pr_cartonunit.Name = "pr_cartonunit";
-            this.pr_cartonunit.Size = new System.Drawing.Size(46, 38);
+            this.pr_cartonunit.Size = new System.Drawing.Size(38, 31);
             this.pr_cartonunit.TabIndex = 42;
             this.pr_cartonunit.Text = "克";
             // 
@@ -178,10 +178,10 @@
             this.label22.BackColor = System.Drawing.SystemColors.ActiveCaptionText;
             this.label22.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.label22.ForeColor = System.Drawing.SystemColors.ControlLightLight;
-            this.label22.Location = new System.Drawing.Point(22, 77);
+            this.label22.Location = new System.Drawing.Point(20, 64);
             this.label22.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label22.Name = "label22";
-            this.label22.Size = new System.Drawing.Size(75, 38);
+            this.label22.Size = new System.Drawing.Size(62, 31);
             this.label22.TabIndex = 20;
             this.label22.Text = "重量";
             // 
@@ -193,20 +193,20 @@
             this.weight.AutoSize = true;
             this.weight.Font = new System.Drawing.Font("微软雅黑", 22.2F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.weight.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(0)))));
-            this.weight.Location = new System.Drawing.Point(156, 65);
+            this.weight.Location = new System.Drawing.Point(139, 54);
             this.weight.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.weight.Name = "weight";
-            this.weight.Size = new System.Drawing.Size(0, 58);
+            this.weight.Size = new System.Drawing.Size(0, 50);
             this.weight.TabIndex = 41;
             // 
             // label15
             // 
             this.label15.AutoSize = true;
             this.label15.Font = new System.Drawing.Font("微软雅黑", 18F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label15.Location = new System.Drawing.Point(39, 36);
+            this.label15.Location = new System.Drawing.Point(35, 30);
             this.label15.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label15.Name = "label15";
-            this.label15.Size = new System.Drawing.Size(92, 46);
+            this.label15.Size = new System.Drawing.Size(77, 39);
             this.label15.TabIndex = 85;
             this.label15.Text = "箱号";
             // 
@@ -214,10 +214,10 @@
             // 
             this.pr_detail_label.AutoSize = true;
             this.pr_detail_label.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_detail_label.Location = new System.Drawing.Point(46, 602);
+            this.pr_detail_label.Location = new System.Drawing.Point(41, 502);
             this.pr_detail_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pr_detail_label.Name = "pr_detail_label";
-            this.pr_detail_label.Size = new System.Drawing.Size(137, 39);
+            this.pr_detail_label.Size = new System.Drawing.Size(115, 32);
             this.pr_detail_label.TabIndex = 82;
             this.pr_detail_label.Text = "产品名称";
             // 
@@ -225,10 +225,10 @@
             // 
             this.ma_qty_label.AutoSize = true;
             this.ma_qty_label.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ma_qty_label.Location = new System.Drawing.Point(46, 727);
+            this.ma_qty_label.Location = new System.Drawing.Point(41, 606);
             this.ma_qty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ma_qty_label.Name = "ma_qty_label";
-            this.ma_qty_label.Size = new System.Drawing.Size(137, 39);
+            this.ma_qty_label.Size = new System.Drawing.Size(115, 32);
             this.ma_qty_label.TabIndex = 84;
             this.ma_qty_label.Text = "工单数量";
             // 
@@ -236,10 +236,10 @@
             // 
             this.ma_salecode_label.AutoSize = true;
             this.ma_salecode_label.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ma_salecode_label.Location = new System.Drawing.Point(46, 481);
+            this.ma_salecode_label.Location = new System.Drawing.Point(41, 401);
             this.ma_salecode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ma_salecode_label.Name = "ma_salecode_label";
-            this.ma_salecode_label.Size = new System.Drawing.Size(137, 39);
+            this.ma_salecode_label.Size = new System.Drawing.Size(115, 32);
             this.ma_salecode_label.TabIndex = 83;
             this.ma_salecode_label.Text = "订单编号";
             // 
@@ -247,20 +247,20 @@
             // 
             this.PrintLabel.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.PrintLabel.FormattingEnabled = true;
-            this.PrintLabel.Location = new System.Drawing.Point(1404, 217);
-            this.PrintLabel.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.PrintLabel.Location = new System.Drawing.Point(1248, 181);
+            this.PrintLabel.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.PrintLabel.Name = "PrintLabel";
-            this.PrintLabel.Size = new System.Drawing.Size(180, 26);
+            this.PrintLabel.Size = new System.Drawing.Size(160, 23);
             this.PrintLabel.TabIndex = 157;
             // 
             // Printer_label
             // 
             this.Printer_label.AutoSize = true;
             this.Printer_label.Font = new System.Drawing.Font("微软雅黑", 10.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.Printer_label.Location = new System.Drawing.Point(1259, 167);
+            this.Printer_label.Location = new System.Drawing.Point(1119, 139);
             this.Printer_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.Printer_label.Name = "Printer_label";
-            this.Printer_label.Size = new System.Drawing.Size(123, 30);
+            this.Printer_label.Size = new System.Drawing.Size(107, 25);
             this.Printer_label.TabIndex = 159;
             this.Printer_label.Text = "打印机列表";
             // 
@@ -268,33 +268,19 @@
             // 
             this.label1.AutoSize = true;
             this.label1.Font = new System.Drawing.Font("微软雅黑", 10.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label1.Location = new System.Drawing.Point(1259, 217);
+            this.label1.Location = new System.Drawing.Point(1119, 181);
             this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(101, 30);
+            this.label1.Size = new System.Drawing.Size(88, 25);
             this.label1.TabIndex = 161;
             this.label1.Text = "打印标签";
             // 
-            // AutoPrint
-            // 
-            this.AutoPrint.AutoSize = true;
-            this.AutoPrint.Checked = true;
-            this.AutoPrint.CheckState = System.Windows.Forms.CheckState.Checked;
-            this.AutoPrint.Font = new System.Drawing.Font("微软雅黑", 10.8F);
-            this.AutoPrint.Location = new System.Drawing.Point(1264, 62);
-            this.AutoPrint.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
-            this.AutoPrint.Name = "AutoPrint";
-            this.AutoPrint.Size = new System.Drawing.Size(127, 34);
-            this.AutoPrint.TabIndex = 169;
-            this.AutoPrint.Text = "自动打印";
-            this.AutoPrint.UseVisualStyleBackColor = true;
-            // 
             // PrintNum
             // 
-            this.PrintNum.Location = new System.Drawing.Point(1405, 114);
-            this.PrintNum.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.PrintNum.Location = new System.Drawing.Point(1249, 95);
+            this.PrintNum.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.PrintNum.Name = "PrintNum";
-            this.PrintNum.Size = new System.Drawing.Size(180, 28);
+            this.PrintNum.Size = new System.Drawing.Size(160, 25);
             this.PrintNum.TabIndex = 170;
             this.PrintNum.Value = new decimal(new int[] {
             1,
@@ -306,10 +292,10 @@
             // 
             this.label2.AutoSize = true;
             this.label2.Font = new System.Drawing.Font("微软雅黑", 10.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label2.Location = new System.Drawing.Point(1259, 115);
+            this.label2.Location = new System.Drawing.Point(1119, 96);
             this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(101, 30);
+            this.label2.Size = new System.Drawing.Size(88, 25);
             this.label2.TabIndex = 171;
             this.label2.Text = "打印张数";
             // 
@@ -317,11 +303,11 @@
             // 
             this.ComList.AutoSize = true;
             this.ComList.CutLength = null;
-            this.ComList.Location = new System.Drawing.Point(1405, 83);
+            this.ComList.Location = new System.Drawing.Point(1249, 69);
             this.ComList.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.ComList.MaximumSize = new System.Drawing.Size(225, 0);
+            this.ComList.MaximumSize = new System.Drawing.Size(200, 0);
             this.ComList.Name = "ComList";
-            this.ComList.Size = new System.Drawing.Size(71, 18);
+            this.ComList.Size = new System.Drawing.Size(63, 15);
             this.ComList.TabIndex = 173;
             this.ComList.Text = "ComList";
             this.ComList.Visible = false;
@@ -330,21 +316,21 @@
             // 
             this.BaudRate.AutoSize = true;
             this.BaudRate.CutLength = null;
-            this.BaudRate.Location = new System.Drawing.Point(1405, 59);
+            this.BaudRate.Location = new System.Drawing.Point(1249, 49);
             this.BaudRate.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.BaudRate.MaximumSize = new System.Drawing.Size(225, 0);
+            this.BaudRate.MaximumSize = new System.Drawing.Size(200, 0);
             this.BaudRate.Name = "BaudRate";
-            this.BaudRate.Size = new System.Drawing.Size(80, 18);
+            this.BaudRate.Size = new System.Drawing.Size(71, 15);
             this.BaudRate.TabIndex = 172;
             this.BaudRate.Text = "BaudRate";
             this.BaudRate.Visible = false;
             // 
             // PrinterList
             // 
-            this.PrinterList.Location = new System.Drawing.Point(1404, 167);
-            this.PrinterList.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
+            this.PrinterList.Location = new System.Drawing.Point(1248, 139);
+            this.PrinterList.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
             this.PrinterList.Name = "PrinterList";
-            this.PrinterList.Size = new System.Drawing.Size(180, 34);
+            this.PrinterList.Size = new System.Drawing.Size(160, 28);
             this.PrinterList.TabIndex = 158;
             // 
             // StartWeight
@@ -354,13 +340,13 @@
             this.StartWeight.DownImage = ((System.Drawing.Image)(resources.GetObject("StartWeight.DownImage")));
             this.StartWeight.Image = ((System.Drawing.Image)(resources.GetObject("StartWeight.Image")));
             this.StartWeight.IsShowBorder = true;
-            this.StartWeight.Location = new System.Drawing.Point(987, 37);
-            this.StartWeight.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.StartWeight.Location = new System.Drawing.Point(877, 31);
+            this.StartWeight.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.StartWeight.MoveImage = ((System.Drawing.Image)(resources.GetObject("StartWeight.MoveImage")));
             this.StartWeight.Name = "StartWeight";
             this.StartWeight.NormalImage = ((System.Drawing.Image)(resources.GetObject("StartWeight.NormalImage")));
             this.StartWeight.Power = null;
-            this.StartWeight.Size = new System.Drawing.Size(112, 36);
+            this.StartWeight.Size = new System.Drawing.Size(100, 30);
             this.StartWeight.TabIndex = 156;
             this.StartWeight.Text = "开始称量";
             this.StartWeight.UseVisualStyleBackColor = true;
@@ -373,13 +359,13 @@
             this.Confirm.DownImage = ((System.Drawing.Image)(resources.GetObject("Confirm.DownImage")));
             this.Confirm.Image = ((System.Drawing.Image)(resources.GetObject("Confirm.Image")));
             this.Confirm.IsShowBorder = true;
-            this.Confirm.Location = new System.Drawing.Point(1378, 266);
-            this.Confirm.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.Confirm.Location = new System.Drawing.Point(1225, 222);
+            this.Confirm.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             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(112, 35);
+            this.Confirm.Size = new System.Drawing.Size(100, 29);
             this.Confirm.TabIndex = 152;
             this.Confirm.Text = "打印";
             this.Confirm.UseVisualStyleBackColor = true;
@@ -389,11 +375,11 @@
             // 
             this.pd_barcode.AutoSize = true;
             this.pd_barcode.CutLength = null;
-            this.pd_barcode.Location = new System.Drawing.Point(1405, 31);
+            this.pd_barcode.Location = new System.Drawing.Point(1249, 26);
             this.pd_barcode.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.pd_barcode.MaximumSize = new System.Drawing.Size(225, 0);
+            this.pd_barcode.MaximumSize = new System.Drawing.Size(200, 0);
             this.pd_barcode.Name = "pd_barcode";
-            this.pd_barcode.Size = new System.Drawing.Size(98, 18);
+            this.pd_barcode.Size = new System.Drawing.Size(87, 15);
             this.pd_barcode.TabIndex = 107;
             this.pd_barcode.Text = "pd_barcode";
             this.pd_barcode.Visible = false;
@@ -405,13 +391,13 @@
             this.StopWeight.DownImage = ((System.Drawing.Image)(resources.GetObject("StopWeight.DownImage")));
             this.StopWeight.Image = ((System.Drawing.Image)(resources.GetObject("StopWeight.Image")));
             this.StopWeight.IsShowBorder = true;
-            this.StopWeight.Location = new System.Drawing.Point(1130, 37);
-            this.StopWeight.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.StopWeight.Location = new System.Drawing.Point(1004, 31);
+            this.StopWeight.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.StopWeight.MoveImage = ((System.Drawing.Image)(resources.GetObject("StopWeight.MoveImage")));
             this.StopWeight.Name = "StopWeight";
             this.StopWeight.NormalImage = ((System.Drawing.Image)(resources.GetObject("StopWeight.NormalImage")));
             this.StopWeight.Power = null;
-            this.StopWeight.Size = new System.Drawing.Size(112, 36);
+            this.StopWeight.Size = new System.Drawing.Size(100, 30);
             this.StopWeight.TabIndex = 102;
             this.StopWeight.Text = "停止称量";
             this.StopWeight.UseVisualStyleBackColor = true;
@@ -422,11 +408,11 @@
             this.ma_code.AutoSize = true;
             this.ma_code.CutLength = null;
             this.ma_code.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ma_code.Location = new System.Drawing.Point(212, 362);
+            this.ma_code.Location = new System.Drawing.Point(188, 302);
             this.ma_code.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.ma_code.MaximumSize = new System.Drawing.Size(225, 0);
+            this.ma_code.MaximumSize = new System.Drawing.Size(200, 0);
             this.ma_code.Name = "ma_code";
-            this.ma_code.Size = new System.Drawing.Size(0, 39);
+            this.ma_code.Size = new System.Drawing.Size(0, 32);
             this.ma_code.TabIndex = 101;
             this.ma_code.Tag = "1";
             // 
@@ -435,11 +421,11 @@
             this.ma_qty.AutoSize = true;
             this.ma_qty.CutLength = null;
             this.ma_qty.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ma_qty.Location = new System.Drawing.Point(212, 727);
+            this.ma_qty.Location = new System.Drawing.Point(188, 606);
             this.ma_qty.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.ma_qty.MaximumSize = new System.Drawing.Size(225, 0);
+            this.ma_qty.MaximumSize = new System.Drawing.Size(200, 0);
             this.ma_qty.Name = "ma_qty";
-            this.ma_qty.Size = new System.Drawing.Size(0, 39);
+            this.ma_qty.Size = new System.Drawing.Size(0, 32);
             this.ma_qty.TabIndex = 100;
             // 
             // pr_detail
@@ -447,11 +433,11 @@
             this.pr_detail.AutoSize = true;
             this.pr_detail.CutLength = null;
             this.pr_detail.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_detail.Location = new System.Drawing.Point(212, 604);
+            this.pr_detail.Location = new System.Drawing.Point(188, 503);
             this.pr_detail.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.pr_detail.MaximumSize = new System.Drawing.Size(225, 0);
+            this.pr_detail.MaximumSize = new System.Drawing.Size(200, 0);
             this.pr_detail.Name = "pr_detail";
-            this.pr_detail.Size = new System.Drawing.Size(0, 39);
+            this.pr_detail.Size = new System.Drawing.Size(0, 32);
             this.pr_detail.TabIndex = 99;
             // 
             // ma_salecode
@@ -459,11 +445,11 @@
             this.ma_salecode.AutoSize = true;
             this.ma_salecode.CutLength = null;
             this.ma_salecode.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ma_salecode.Location = new System.Drawing.Point(212, 481);
+            this.ma_salecode.Location = new System.Drawing.Point(188, 401);
             this.ma_salecode.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.ma_salecode.MaximumSize = new System.Drawing.Size(225, 0);
+            this.ma_salecode.MaximumSize = new System.Drawing.Size(200, 0);
             this.ma_salecode.Name = "ma_salecode";
-            this.ma_salecode.Size = new System.Drawing.Size(0, 39);
+            this.ma_salecode.Size = new System.Drawing.Size(0, 32);
             this.ma_salecode.TabIndex = 98;
             // 
             // Clean
@@ -473,13 +459,13 @@
             this.Clean.DownImage = ((System.Drawing.Image)(resources.GetObject("Clean.DownImage")));
             this.Clean.Image = ((System.Drawing.Image)(resources.GetObject("Clean.Image")));
             this.Clean.IsShowBorder = true;
-            this.Clean.Location = new System.Drawing.Point(1390, 793);
-            this.Clean.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.Clean.Location = new System.Drawing.Point(1236, 661);
+            this.Clean.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.Clean.MoveImage = ((System.Drawing.Image)(resources.GetObject("Clean.MoveImage")));
             this.Clean.Name = "Clean";
             this.Clean.NormalImage = ((System.Drawing.Image)(resources.GetObject("Clean.NormalImage")));
             this.Clean.Power = null;
-            this.Clean.Size = new System.Drawing.Size(112, 36);
+            this.Clean.Size = new System.Drawing.Size(100, 30);
             this.Clean.TabIndex = 89;
             this.Clean.Text = "清除";
             this.Clean.UseVisualStyleBackColor = true;
@@ -491,8 +477,8 @@
             this.normalButton1.DownImage = ((System.Drawing.Image)(resources.GetObject("normalButton1.DownImage")));
             this.normalButton1.Image = ((System.Drawing.Image)(resources.GetObject("normalButton1.Image")));
             this.normalButton1.IsShowBorder = true;
-            this.normalButton1.Location = new System.Drawing.Point(37, 83);
-            this.normalButton1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.normalButton1.Location = new System.Drawing.Point(33, 69);
+            this.normalButton1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.normalButton1.MoveImage = ((System.Drawing.Image)(resources.GetObject("normalButton1.MoveImage")));
             this.normalButton1.Name = "normalButton1";
             this.normalButton1.NormalImage = ((System.Drawing.Image)(resources.GetObject("normalButton1.NormalImage")));
@@ -508,11 +494,11 @@
             this.outboxcode.BackColor = System.Drawing.Color.White;
             this.outboxcode.Font = new System.Drawing.Font("微软雅黑", 18F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.outboxcode.ID = null;
-            this.outboxcode.Location = new System.Drawing.Point(141, 31);
-            this.outboxcode.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.outboxcode.Location = new System.Drawing.Point(125, 26);
+            this.outboxcode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.outboxcode.Name = "outboxcode";
             this.outboxcode.Power = null;
-            this.outboxcode.Size = new System.Drawing.Size(811, 55);
+            this.outboxcode.Size = new System.Drawing.Size(721, 47);
             this.outboxcode.Str = null;
             this.outboxcode.Str1 = null;
             this.outboxcode.Str2 = null;
@@ -522,10 +508,10 @@
             // OperateResult
             // 
             this.OperateResult.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.OperateResult.Location = new System.Drawing.Point(1264, 320);
-            this.OperateResult.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.OperateResult.Location = new System.Drawing.Point(1124, 267);
+            this.OperateResult.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.OperateResult.Name = "OperateResult";
-            this.OperateResult.Size = new System.Drawing.Size(334, 450);
+            this.OperateResult.Size = new System.Drawing.Size(297, 376);
             this.OperateResult.TabIndex = 87;
             this.OperateResult.Text = "";
             // 
@@ -536,10 +522,10 @@
             this.columnHeader2,
             this.columnHeader3,
             this.columnHeader4});
-            this.WeighRecord.Location = new System.Drawing.Point(633, 320);
-            this.WeighRecord.Margin = new System.Windows.Forms.Padding(4);
+            this.WeighRecord.Location = new System.Drawing.Point(563, 267);
+            this.WeighRecord.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.WeighRecord.Name = "WeighRecord";
-            this.WeighRecord.Size = new System.Drawing.Size(580, 450);
+            this.WeighRecord.Size = new System.Drawing.Size(516, 376);
             this.WeighRecord.TabIndex = 174;
             this.WeighRecord.UseCompatibleStateImageBehavior = false;
             this.WeighRecord.View = System.Windows.Forms.View.Details;
@@ -564,17 +550,25 @@
             this.columnHeader4.Text = "时间";
             this.columnHeader4.Width = 130;
             // 
+            // AutoPrint
+            // 
+            this.AutoPrint.Checked = false;
+            this.AutoPrint.Location = new System.Drawing.Point(1124, 49);
+            this.AutoPrint.Name = "AutoPrint";
+            this.AutoPrint.Size = new System.Drawing.Size(118, 35);
+            this.AutoPrint.TabIndex = 175;
+            // 
             // Make_CartonBoxWeigh
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1608, 840);
+            this.ClientSize = new System.Drawing.Size(1429, 700);
+            this.Controls.Add(this.AutoPrint);
             this.Controls.Add(this.WeighRecord);
             this.Controls.Add(this.ComList);
             this.Controls.Add(this.BaudRate);
             this.Controls.Add(this.label2);
             this.Controls.Add(this.PrintNum);
-            this.Controls.Add(this.AutoPrint);
             this.Controls.Add(this.label1);
             this.Controls.Add(this.Printer_label);
             this.Controls.Add(this.PrinterList);
@@ -599,7 +593,7 @@
             this.Controls.Add(this.ma_salecode_label);
             this.Controls.Add(this.OperateResult);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
-            this.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.Name = "Make_CartonBoxWeigh";
             this.Tag = "Make!CartonBoxWeigh";
             this.Text = "卡通箱称重";
@@ -648,7 +642,6 @@
         private CustomControl.ComBoxWithFocus.PrinterCombox PrinterList;
         private System.Windows.Forms.Label Printer_label;
         private System.Windows.Forms.Label label1;
-        private System.Windows.Forms.CheckBox AutoPrint;
         private System.Windows.Forms.NumericUpDown PrintNum;
         private System.Windows.Forms.Label label2;
         private CustomControl.ValueLabel.ValueLabel BaudRate;
@@ -658,5 +651,6 @@
         private System.Windows.Forms.ColumnHeader columnHeader2;
         private System.Windows.Forms.ColumnHeader columnHeader3;
         private System.Windows.Forms.ColumnHeader columnHeader4;
+        private CustomControl.CustomCheckBox.AutoPrintCheckBox AutoPrint;
     }
 }

UAS-MES/FunctionCode/Make/Make_ColorBoxWeigh.Designer.cs

@@ -48,7 +48,6 @@
             this.PrintLabel = new System.Windows.Forms.ComboBox();
             this.Printer_label = new System.Windows.Forms.Label();
             this.PrintLabel_label = new System.Windows.Forms.Label();
-            this.AutoPrint = new System.Windows.Forms.CheckBox();
             this.PrintNum = new System.Windows.Forms.NumericUpDown();
             this.label1 = new System.Windows.Forms.Label();
             this.PrinterList = new UAS_MES.CustomControl.ComBoxWithFocus.PrinterCombox();
@@ -72,6 +71,7 @@
             this.columnHeader2 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
             this.columnHeader3 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
             this.columnHeader4 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
+            this.AutoPrint = new UAS_MES.CustomControl.CustomCheckBox.AutoPrintCheckBox();
             this.panel6.SuspendLayout();
             this.panel4.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.PrintNum)).BeginInit();
@@ -297,20 +297,6 @@
             this.PrintLabel_label.TabIndex = 163;
             this.PrintLabel_label.Text = "打印标签";
             // 
-            // AutoPrint
-            // 
-            this.AutoPrint.AutoSize = true;
-            this.AutoPrint.Checked = true;
-            this.AutoPrint.CheckState = System.Windows.Forms.CheckState.Checked;
-            this.AutoPrint.Font = new System.Drawing.Font("微软雅黑", 10.8F);
-            this.AutoPrint.Location = new System.Drawing.Point(1072, 28);
-            this.AutoPrint.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
-            this.AutoPrint.Name = "AutoPrint";
-            this.AutoPrint.Size = new System.Drawing.Size(110, 29);
-            this.AutoPrint.TabIndex = 168;
-            this.AutoPrint.Text = "自动打印";
-            this.AutoPrint.UseVisualStyleBackColor = true;
-            // 
             // PrintNum
             // 
             this.PrintNum.Location = new System.Drawing.Point(1211, 70);
@@ -597,17 +583,25 @@
             this.columnHeader4.Text = "时间";
             this.columnHeader4.Width = 130;
             // 
+            // AutoPrint
+            // 
+            this.AutoPrint.Checked = false;
+            this.AutoPrint.Location = new System.Drawing.Point(1072, 27);
+            this.AutoPrint.Name = "AutoPrint";
+            this.AutoPrint.Size = new System.Drawing.Size(112, 34);
+            this.AutoPrint.TabIndex = 174;
+            // 
             // Make_ColorBoxWeigh
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(1389, 730);
+            this.Controls.Add(this.AutoPrint);
             this.Controls.Add(this.WeighRecord);
             this.Controls.Add(this.ComList);
             this.Controls.Add(this.BaudRate);
             this.Controls.Add(this.label1);
             this.Controls.Add(this.PrintNum);
-            this.Controls.Add(this.AutoPrint);
             this.Controls.Add(this.PrintLabel_label);
             this.Controls.Add(this.Printer_label);
             this.Controls.Add(this.PrinterList);
@@ -686,7 +680,6 @@
         private CustomControl.ComBoxWithFocus.PrinterCombox PrinterList;
         private System.Windows.Forms.Label Printer_label;
         private System.Windows.Forms.Label PrintLabel_label;
-        private System.Windows.Forms.CheckBox AutoPrint;
         private System.Windows.Forms.NumericUpDown PrintNum;
         private System.Windows.Forms.Label label1;
         private System.Windows.Forms.Label BaudRate;
@@ -696,5 +689,6 @@
         private System.Windows.Forms.ColumnHeader columnHeader2;
         private System.Windows.Forms.ColumnHeader columnHeader3;
         private System.Windows.Forms.ColumnHeader columnHeader4;
+        private CustomControl.CustomCheckBox.AutoPrintCheckBox AutoPrint;
     }
 }

UAS-MES/FunctionCode/Make/Make_NewBigBox.cs

@@ -74,7 +74,7 @@ namespace UAS_MES.Make
         {
             if (pa_outboxcode.Text != "" && pr_bigboxinnerqty.Text != "" && pr_code.Text != "")
             {
-                string sql = "insert into package (pa_id,pa_outboxcode,pa_makecode,pa_indate,pa_packageqty,pa_type,pa_prodcode，pa_level，PA_STATUS,pa_packageqty)values";
+                string sql = "insert into package (pa_id,pa_outboxcode,pa_makecode,pa_indate,pa_packageqty,pa_type,pa_prodcode，pa_level，PA_STATUS,pa_standardqty)values";
                 sql += "(package_seq.nextval,'" + pa_outboxcode.Text + "','" + pa_outboxcode.MakeCode + "',sysdate,'0','" + pa_type + "','" + pr_code.Text + "',0,'','" + pr_bigboxinnerqty.Text + "')";
                 dh.ExecuteSql(sql, "insert");
             }

UAS-MES/FunctionCode/Make/Make_PackageCollection.Designer.cs

@@ -41,7 +41,6 @@
             this.PrintList_label = new System.Windows.Forms.Label();
             this.PrintNum_label = new System.Windows.Forms.Label();
             this.pa_restqty_label = new System.Windows.Forms.Label();
-            this.AutoPrint = new System.Windows.Forms.CheckBox();
             this.Cancel = new System.Windows.Forms.CheckBox();
             this.pa_id = new System.Windows.Forms.Label();
             this.PrintLabel = new System.Windows.Forms.ComboBox();
@@ -66,6 +65,7 @@
             this.pa_indate = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.pd_id = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.pr_outboxinnerqty = new System.Windows.Forms.NumericUpDown();
+            this.AutoPrint = new UAS_MES.CustomControl.CustomCheckBox.AutoPrintCheckBox();
             this.panel2.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.PrintNum)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.PackageDetail)).BeginInit();
@@ -112,7 +112,7 @@
             this.panel2.Controls.Add(this.label1);
             this.panel2.Dock = System.Windows.Forms.DockStyle.Top;
             this.panel2.Location = new System.Drawing.Point(0, 0);
-            this.panel2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.panel2.Margin = new System.Windows.Forms.Padding(4);
             this.panel2.Name = "panel2";
             this.panel2.Size = new System.Drawing.Size(1359, 36);
             this.panel2.TabIndex = 88;
@@ -208,24 +208,12 @@
             this.pa_restqty_label.TabIndex = 126;
             this.pa_restqty_label.Text = "剩余容量";
             // 
-            // AutoPrint
-            // 
-            this.AutoPrint.AutoSize = true;
-            this.AutoPrint.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.AutoPrint.Location = new System.Drawing.Point(1048, 128);
-            this.AutoPrint.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
-            this.AutoPrint.Name = "AutoPrint";
-            this.AutoPrint.Size = new System.Drawing.Size(154, 31);
-            this.AutoPrint.TabIndex = 128;
-            this.AutoPrint.Text = "满箱自动打印";
-            this.AutoPrint.UseVisualStyleBackColor = true;
-            // 
             // Cancel
             // 
             this.Cancel.AutoSize = true;
             this.Cancel.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.Cancel.Location = new System.Drawing.Point(429, 715);
-            this.Cancel.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.Cancel.Margin = new System.Windows.Forms.Padding(4);
             this.Cancel.Name = "Cancel";
             this.Cancel.Size = new System.Drawing.Size(114, 31);
             this.Cancel.TabIndex = 129;
@@ -280,7 +268,7 @@
             // PrintNum
             // 
             this.PrintNum.Location = new System.Drawing.Point(1104, 189);
-            this.PrintNum.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.PrintNum.Margin = new System.Windows.Forms.Padding(4);
             this.PrintNum.Name = "PrintNum";
             this.PrintNum.Size = new System.Drawing.Size(67, 25);
             this.PrintNum.TabIndex = 164;
@@ -295,7 +283,7 @@
             this.pa_outboxcode.Caller = null;
             this.pa_outboxcode.Location = new System.Drawing.Point(145, 68);
             this.pa_outboxcode.MakeCode = null;
-            this.pa_outboxcode.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
+            this.pa_outboxcode.Margin = new System.Windows.Forms.Padding(5);
             this.pa_outboxcode.Name = "pa_outboxcode";
             this.pa_outboxcode.Pr_id = null;
             this.pa_outboxcode.ProdCode = null;
@@ -307,7 +295,7 @@
             // PrintList
             // 
             this.PrintList.Location = new System.Drawing.Point(145, 186);
-            this.PrintList.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
+            this.PrintList.Margin = new System.Windows.Forms.Padding(5);
             this.PrintList.Name = "PrintList";
             this.PrintList.Size = new System.Drawing.Size(197, 31);
             this.PrintList.TabIndex = 158;
@@ -316,7 +304,7 @@
             // 
             this.OperateResult.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.OperateResult.Location = new System.Drawing.Point(1036, 268);
-            this.OperateResult.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.OperateResult.Margin = new System.Windows.Forms.Padding(4);
             this.OperateResult.Name = "OperateResult";
             this.OperateResult.Size = new System.Drawing.Size(291, 429);
             this.OperateResult.TabIndex = 155;
@@ -331,7 +319,7 @@
             this.ma_code.DBTitle = "工单查询";
             this.ma_code.FormName = null;
             this.ma_code.Location = new System.Drawing.Point(473, 68);
-            this.ma_code.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.ma_code.Margin = new System.Windows.Forms.Padding(4);
             this.ma_code.Name = "ma_code";
             this.ma_code.Power = null;
             this.ma_code.ReturnData = null;
@@ -352,7 +340,7 @@
             this.Printing.Image = ((System.Drawing.Image)(resources.GetObject("Printing.Image")));
             this.Printing.IsShowBorder = true;
             this.Printing.Location = new System.Drawing.Point(1183, 186);
-            this.Printing.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.Printing.Margin = new System.Windows.Forms.Padding(4);
             this.Printing.MoveImage = ((System.Drawing.Image)(resources.GetObject("Printing.MoveImage")));
             this.Printing.Name = "Printing";
             this.Printing.NormalImage = ((System.Drawing.Image)(resources.GetObject("Printing.NormalImage")));
@@ -372,7 +360,7 @@
             this.Clean.Image = ((System.Drawing.Image)(resources.GetObject("Clean.Image")));
             this.Clean.IsShowBorder = true;
             this.Clean.Location = new System.Drawing.Point(1141, 714);
-            this.Clean.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.Clean.Margin = new System.Windows.Forms.Padding(4);
             this.Clean.MoveImage = ((System.Drawing.Image)(resources.GetObject("Clean.MoveImage")));
             this.Clean.Name = "Clean";
             this.Clean.NormalImage = ((System.Drawing.Image)(resources.GetObject("Clean.NormalImage")));
@@ -390,7 +378,7 @@
             this.pa_packageqty.Enabled = false;
             this.pa_packageqty.ID = null;
             this.pa_packageqty.Location = new System.Drawing.Point(472, 128);
-            this.pa_packageqty.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.pa_packageqty.Margin = new System.Windows.Forms.Padding(4);
             this.pa_packageqty.Name = "pa_packageqty";
             this.pa_packageqty.Power = null;
             this.pa_packageqty.Size = new System.Drawing.Size(199, 25);
@@ -408,7 +396,7 @@
             this.pr_code.Enabled = false;
             this.pr_code.ID = null;
             this.pr_code.Location = new System.Drawing.Point(815, 69);
-            this.pr_code.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.pr_code.Margin = new System.Windows.Forms.Padding(4);
             this.pr_code.Name = "pr_code";
             this.pr_code.Power = null;
             this.pr_code.Size = new System.Drawing.Size(199, 25);
@@ -426,7 +414,7 @@
             this.pr_detail.Enabled = false;
             this.pr_detail.ID = null;
             this.pr_detail.Location = new System.Drawing.Point(145, 128);
-            this.pr_detail.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.pr_detail.Margin = new System.Windows.Forms.Padding(4);
             this.pr_detail.Name = "pr_detail";
             this.pr_detail.Power = null;
             this.pr_detail.Size = new System.Drawing.Size(197, 25);
@@ -443,7 +431,7 @@
             this.pa_restqty.Enabled = false;
             this.pa_restqty.ID = null;
             this.pa_restqty.Location = new System.Drawing.Point(815, 128);
-            this.pa_restqty.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.pa_restqty.Margin = new System.Windows.Forms.Padding(4);
             this.pa_restqty.Name = "pa_restqty";
             this.pa_restqty.Power = null;
             this.pa_restqty.Size = new System.Drawing.Size(199, 25);
@@ -459,7 +447,7 @@
             this.barcode.BackColor = System.Drawing.Color.White;
             this.barcode.ID = null;
             this.barcode.Location = new System.Drawing.Point(117, 715);
-            this.barcode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.barcode.Margin = new System.Windows.Forms.Padding(4);
             this.barcode.Name = "barcode";
             this.barcode.Power = "ifwrite";
             this.barcode.Size = new System.Drawing.Size(260, 25);
@@ -483,7 +471,7 @@
             this.pa_indate,
             this.pd_id});
             this.PackageDetail.Location = new System.Drawing.Point(21, 268);
-            this.PackageDetail.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.PackageDetail.Margin = new System.Windows.Forms.Padding(4);
             this.PackageDetail.Name = "PackageDetail";
             this.PackageDetail.ReadOnly = true;
             this.PackageDetail.RowTemplate.Height = 23;
@@ -538,16 +526,25 @@
             // pr_outboxinnerqty
             // 
             this.pr_outboxinnerqty.Location = new System.Drawing.Point(472, 188);
-            this.pr_outboxinnerqty.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.pr_outboxinnerqty.Margin = new System.Windows.Forms.Padding(4);
             this.pr_outboxinnerqty.Name = "pr_outboxinnerqty";
             this.pr_outboxinnerqty.Size = new System.Drawing.Size(201, 25);
             this.pr_outboxinnerqty.TabIndex = 165;
             // 
+            // AutoPrint
+            // 
+            this.AutoPrint.Checked = false;
+            this.AutoPrint.Location = new System.Drawing.Point(1048, 128);
+            this.AutoPrint.Name = "AutoPrint";
+            this.AutoPrint.Size = new System.Drawing.Size(123, 27);
+            this.AutoPrint.TabIndex = 166;
+            // 
             // Make_PackageCollection
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(1359, 760);
+            this.Controls.Add(this.AutoPrint);
             this.Controls.Add(this.pr_outboxinnerqty);
             this.Controls.Add(this.PrintNum);
             this.Controls.Add(this.pa_outboxcode);
@@ -567,7 +564,6 @@
             this.Controls.Add(this.barcode);
             this.Controls.Add(this.PackageDetail);
             this.Controls.Add(this.Cancel);
-            this.Controls.Add(this.AutoPrint);
             this.Controls.Add(this.pa_restqty_label);
             this.Controls.Add(this.PrintNum_label);
             this.Controls.Add(this.PrintList_label);
@@ -580,7 +576,7 @@
             this.Controls.Add(this.pr_detail_label);
             this.Controls.Add(this.ma_code_label);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
-            this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.Margin = new System.Windows.Forms.Padding(4);
             this.Name = "Make_PackageCollection";
             this.Tag = "Make!PackageCollection";
             this.Text = "包装采集";
@@ -611,7 +607,6 @@
         private System.Windows.Forms.Label PrintList_label;
         private System.Windows.Forms.Label PrintNum_label; 
         private System.Windows.Forms.Label pa_restqty_label;
-        private System.Windows.Forms.CheckBox AutoPrint;
         private System.Windows.Forms.CheckBox Cancel;
   
         private CustomControl.DataGrid_View.DataGridViewWithSerialNum PackageDetail;
@@ -637,5 +632,6 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn pa_indate;
         private System.Windows.Forms.DataGridViewTextBoxColumn pd_id;
         private System.Windows.Forms.NumericUpDown pr_outboxinnerqty;
+        private CustomControl.CustomCheckBox.AutoPrintCheckBox AutoPrint;
     }
 }

UAS-MES/FunctionCode/Make/Make_PackageCollection.resx

@@ -395,4 +395,19 @@
   <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="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>
 </root>

UAS-MES/FunctionCode/Make/Make_PalletWeigh.Designer.cs

@@ -37,7 +37,6 @@
             this.label1 = new System.Windows.Forms.Label();
             this.Printer_label = new System.Windows.Forms.Label();
             this.PrintLabel = new System.Windows.Forms.ComboBox();
-            this.autoPrint = new System.Windows.Forms.CheckBox();
             this.printNum_label = new System.Windows.Forms.Label();
             this.label2 = new System.Windows.Forms.Label();
             this.label3 = new System.Windows.Forms.Label();
@@ -66,6 +65,7 @@
             this.Printer = new UAS_MES.CustomControl.ComBoxWithFocus.PrinterCombox();
             this.palletcode = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.pr_detailspec = new System.Windows.Forms.Label();
+            this.autoPrint = new UAS_MES.CustomControl.CustomCheckBox.AutoPrintCheckBox();
             this.panel4.SuspendLayout();
             this.SuspendLayout();
             // 
@@ -75,10 +75,10 @@
             this.panel4.Controls.Add(this.pr_cartonunit);
             this.panel4.Controls.Add(this.label22);
             this.panel4.Controls.Add(this.weight);
-            this.panel4.Location = new System.Drawing.Point(46, 92);
-            this.panel4.Margin = new System.Windows.Forms.Padding(4);
+            this.panel4.Location = new System.Drawing.Point(41, 77);
+            this.panel4.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.panel4.Name = "panel4";
-            this.panel4.Size = new System.Drawing.Size(552, 186);
+            this.panel4.Size = new System.Drawing.Size(491, 155);
             this.panel4.TabIndex = 92;
             // 
             // pr_cartonunit
@@ -87,10 +87,10 @@
             this.pr_cartonunit.BackColor = System.Drawing.SystemColors.ActiveCaptionText;
             this.pr_cartonunit.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.pr_cartonunit.ForeColor = System.Drawing.SystemColors.ControlLightLight;
-            this.pr_cartonunit.Location = new System.Drawing.Point(460, 76);
+            this.pr_cartonunit.Location = new System.Drawing.Point(409, 63);
             this.pr_cartonunit.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pr_cartonunit.Name = "pr_cartonunit";
-            this.pr_cartonunit.Size = new System.Drawing.Size(46, 38);
+            this.pr_cartonunit.Size = new System.Drawing.Size(38, 31);
             this.pr_cartonunit.TabIndex = 42;
             this.pr_cartonunit.Text = "克";
             // 
@@ -100,10 +100,10 @@
             this.label22.BackColor = System.Drawing.SystemColors.ActiveCaptionText;
             this.label22.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.label22.ForeColor = System.Drawing.SystemColors.ControlLightLight;
-            this.label22.Location = new System.Drawing.Point(22, 76);
+            this.label22.Location = new System.Drawing.Point(20, 63);
             this.label22.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label22.Name = "label22";
-            this.label22.Size = new System.Drawing.Size(75, 38);
+            this.label22.Size = new System.Drawing.Size(62, 31);
             this.label22.TabIndex = 20;
             this.label22.Text = "重量";
             // 
@@ -115,20 +115,20 @@
             this.weight.AutoSize = true;
             this.weight.Font = new System.Drawing.Font("微软雅黑", 22.2F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.weight.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(0)))));
-            this.weight.Location = new System.Drawing.Point(156, 64);
+            this.weight.Location = new System.Drawing.Point(139, 53);
             this.weight.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.weight.Name = "weight";
-            this.weight.Size = new System.Drawing.Size(0, 58);
+            this.weight.Size = new System.Drawing.Size(0, 50);
             this.weight.TabIndex = 41;
             // 
             // label15
             // 
             this.label15.AutoSize = true;
             this.label15.Font = new System.Drawing.Font("微软雅黑", 18F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label15.Location = new System.Drawing.Point(46, 16);
+            this.label15.Location = new System.Drawing.Point(41, 13);
             this.label15.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label15.Name = "label15";
-            this.label15.Size = new System.Drawing.Size(128, 46);
+            this.label15.Size = new System.Drawing.Size(107, 39);
             this.label15.TabIndex = 93;
             this.label15.Text = "栈板号";
             // 
@@ -136,10 +136,10 @@
             // 
             this.label1.AutoSize = true;
             this.label1.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.label1.Location = new System.Drawing.Point(978, 94);
+            this.label1.Location = new System.Drawing.Point(869, 78);
             this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(110, 31);
+            this.label1.Size = new System.Drawing.Size(92, 27);
             this.label1.TabIndex = 165;
             this.label1.Text = "打印标签";
             // 
@@ -147,10 +147,10 @@
             // 
             this.Printer_label.AutoSize = true;
             this.Printer_label.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.Printer_label.Location = new System.Drawing.Point(978, 21);
+            this.Printer_label.Location = new System.Drawing.Point(869, 17);
             this.Printer_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.Printer_label.Name = "Printer_label";
-            this.Printer_label.Size = new System.Drawing.Size(134, 31);
+            this.Printer_label.Size = new System.Drawing.Size(112, 27);
             this.Printer_label.TabIndex = 164;
             this.Printer_label.Text = "打印机列表";
             // 
@@ -159,32 +159,19 @@
             this.PrintLabel.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.PrintLabel.Font = new System.Drawing.Font("宋体", 9F);
             this.PrintLabel.FormattingEnabled = true;
-            this.PrintLabel.Location = new System.Drawing.Point(1125, 100);
-            this.PrintLabel.Margin = new System.Windows.Forms.Padding(4);
+            this.PrintLabel.Location = new System.Drawing.Point(1000, 83);
+            this.PrintLabel.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.PrintLabel.Name = "PrintLabel";
-            this.PrintLabel.Size = new System.Drawing.Size(196, 26);
+            this.PrintLabel.Size = new System.Drawing.Size(175, 23);
             this.PrintLabel.TabIndex = 162;
             // 
-            // autoPrint
-            // 
-            this.autoPrint.AutoSize = true;
-            this.autoPrint.Checked = true;
-            this.autoPrint.CheckState = System.Windows.Forms.CheckState.Checked;
-            this.autoPrint.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.autoPrint.Location = new System.Drawing.Point(984, 321);
-            this.autoPrint.Name = "autoPrint";
-            this.autoPrint.Size = new System.Drawing.Size(136, 35);
-            this.autoPrint.TabIndex = 166;
-            this.autoPrint.Text = "自动打印";
-            this.autoPrint.UseVisualStyleBackColor = true;
-            // 
             // printNum_label
             // 
             this.printNum_label.AutoSize = true;
             this.printNum_label.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.printNum_label.Location = new System.Drawing.Point(978, 171);
+            this.printNum_label.Location = new System.Drawing.Point(869, 142);
             this.printNum_label.Name = "printNum_label";
-            this.printNum_label.Size = new System.Drawing.Size(62, 31);
+            this.printNum_label.Size = new System.Drawing.Size(52, 27);
             this.printNum_label.TabIndex = 167;
             this.printNum_label.Text = "份数";
             // 
@@ -192,9 +179,9 @@
             // 
             this.label2.AutoSize = true;
             this.label2.Font = new System.Drawing.Font("微软雅黑", 15F);
-            this.label2.Location = new System.Drawing.Point(39, 316);
+            this.label2.Location = new System.Drawing.Point(35, 263);
             this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(107, 39);
+            this.label2.Size = new System.Drawing.Size(90, 32);
             this.label2.TabIndex = 169;
             this.label2.Text = "工单号";
             // 
@@ -202,9 +189,9 @@
             // 
             this.label3.AutoSize = true;
             this.label3.Font = new System.Drawing.Font("微软雅黑", 15F);
-            this.label3.Location = new System.Drawing.Point(39, 378);
+            this.label3.Location = new System.Drawing.Point(35, 315);
             this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(137, 39);
+            this.label3.Size = new System.Drawing.Size(115, 32);
             this.label3.TabIndex = 170;
             this.label3.Text = "栈内总数";
             // 
@@ -212,9 +199,9 @@
             // 
             this.label4.AutoSize = true;
             this.label4.Font = new System.Drawing.Font("微软雅黑", 15F);
-            this.label4.Location = new System.Drawing.Point(39, 446);
+            this.label4.Location = new System.Drawing.Point(35, 372);
             this.label4.Name = "label4";
-            this.label4.Size = new System.Drawing.Size(137, 39);
+            this.label4.Size = new System.Drawing.Size(115, 32);
             this.label4.TabIndex = 171;
             this.label4.Text = "产品编号";
             // 
@@ -222,9 +209,9 @@
             // 
             this.label5.AutoSize = true;
             this.label5.Font = new System.Drawing.Font("微软雅黑", 15F);
-            this.label5.Location = new System.Drawing.Point(39, 513);
+            this.label5.Location = new System.Drawing.Point(35, 427);
             this.label5.Name = "label5";
-            this.label5.Size = new System.Drawing.Size(137, 39);
+            this.label5.Size = new System.Drawing.Size(115, 32);
             this.label5.TabIndex = 172;
             this.label5.Text = "名称规格";
             // 
@@ -232,9 +219,9 @@
             // 
             this.label6.AutoSize = true;
             this.label6.Font = new System.Drawing.Font("微软雅黑", 15F);
-            this.label6.Location = new System.Drawing.Point(430, 316);
+            this.label6.Location = new System.Drawing.Point(382, 263);
             this.label6.Name = "label6";
-            this.label6.Size = new System.Drawing.Size(137, 39);
+            this.label6.Size = new System.Drawing.Size(115, 32);
             this.label6.TabIndex = 173;
             this.label6.Text = "订单编号";
             // 
@@ -242,9 +229,9 @@
             // 
             this.label7.AutoSize = true;
             this.label7.Font = new System.Drawing.Font("微软雅黑", 15F);
-            this.label7.Location = new System.Drawing.Point(430, 378);
+            this.label7.Location = new System.Drawing.Point(382, 315);
             this.label7.Name = "label7";
-            this.label7.Size = new System.Drawing.Size(137, 39);
+            this.label7.Size = new System.Drawing.Size(115, 32);
             this.label7.TabIndex = 174;
             this.label7.Text = "栈内件数";
             // 
@@ -252,9 +239,9 @@
             // 
             this.label8.AutoSize = true;
             this.label8.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label8.Location = new System.Drawing.Point(978, 248);
+            this.label8.Location = new System.Drawing.Point(869, 207);
             this.label8.Name = "label8";
-            this.label8.Size = new System.Drawing.Size(62, 31);
+            this.label8.Size = new System.Drawing.Size(52, 27);
             this.label8.TabIndex = 176;
             this.label8.Text = "已称";
             // 
@@ -266,9 +253,10 @@
             this.columnHeader3,
             this.columnHeader4});
             this.showResult.Font = new System.Drawing.Font("宋体", 11F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.showResult.Location = new System.Drawing.Point(770, 378);
+            this.showResult.Location = new System.Drawing.Point(684, 315);
+            this.showResult.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.showResult.Name = "showResult";
-            this.showResult.Size = new System.Drawing.Size(584, 506);
+            this.showResult.Size = new System.Drawing.Size(520, 422);
             this.showResult.TabIndex = 190;
             this.showResult.UseCompatibleStateImageBehavior = false;
             this.showResult.View = System.Windows.Forms.View.Details;
@@ -299,11 +287,11 @@
             // 
             this.ComList.AutoSize = true;
             this.ComList.CutLength = null;
-            this.ComList.Location = new System.Drawing.Point(669, 184);
+            this.ComList.Location = new System.Drawing.Point(595, 153);
             this.ComList.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.ComList.MaximumSize = new System.Drawing.Size(225, 0);
+            this.ComList.MaximumSize = new System.Drawing.Size(200, 0);
             this.ComList.Name = "ComList";
-            this.ComList.Size = new System.Drawing.Size(71, 18);
+            this.ComList.Size = new System.Drawing.Size(63, 15);
             this.ComList.TabIndex = 191;
             this.ComList.Text = "ComList";
             this.ComList.Visible = false;
@@ -313,12 +301,12 @@
             this.BaudRate.AllPower = null;
             this.BaudRate.BackColor = System.Drawing.Color.White;
             this.BaudRate.ID = null;
-            this.BaudRate.Location = new System.Drawing.Point(670, 134);
-            this.BaudRate.Margin = new System.Windows.Forms.Padding(4);
+            this.BaudRate.Location = new System.Drawing.Point(596, 112);
+            this.BaudRate.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.BaudRate.Name = "BaudRate";
             this.BaudRate.Negative = false;
             this.BaudRate.Power = null;
-            this.BaudRate.Size = new System.Drawing.Size(178, 28);
+            this.BaudRate.Size = new System.Drawing.Size(159, 25);
             this.BaudRate.Str = null;
             this.BaudRate.Str1 = null;
             this.BaudRate.Str2 = null;
@@ -332,12 +320,13 @@
             this.stopWeigh.DownImage = ((System.Drawing.Image)(resources.GetObject("stopWeigh.DownImage")));
             this.stopWeigh.Image = null;
             this.stopWeigh.IsShowBorder = true;
-            this.stopWeigh.Location = new System.Drawing.Point(770, 21);
+            this.stopWeigh.Location = new System.Drawing.Point(684, 17);
+            this.stopWeigh.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.stopWeigh.MoveImage = ((System.Drawing.Image)(resources.GetObject("stopWeigh.MoveImage")));
             this.stopWeigh.Name = "stopWeigh";
             this.stopWeigh.NormalImage = ((System.Drawing.Image)(resources.GetObject("stopWeigh.NormalImage")));
             this.stopWeigh.Power = null;
-            this.stopWeigh.Size = new System.Drawing.Size(108, 38);
+            this.stopWeigh.Size = new System.Drawing.Size(96, 32);
             this.stopWeigh.TabIndex = 187;
             this.stopWeigh.Text = "停止称重";
             this.stopWeigh.UseVisualStyleBackColor = false;
@@ -350,12 +339,13 @@
             this.startWeigh.DownImage = ((System.Drawing.Image)(resources.GetObject("startWeigh.DownImage")));
             this.startWeigh.Image = null;
             this.startWeigh.IsShowBorder = true;
-            this.startWeigh.Location = new System.Drawing.Point(650, 21);
+            this.startWeigh.Location = new System.Drawing.Point(578, 17);
+            this.startWeigh.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.startWeigh.MoveImage = ((System.Drawing.Image)(resources.GetObject("startWeigh.MoveImage")));
             this.startWeigh.Name = "startWeigh";
             this.startWeigh.NormalImage = ((System.Drawing.Image)(resources.GetObject("startWeigh.NormalImage")));
             this.startWeigh.Power = null;
-            this.startWeigh.Size = new System.Drawing.Size(92, 38);
+            this.startWeigh.Size = new System.Drawing.Size(82, 32);
             this.startWeigh.TabIndex = 186;
             this.startWeigh.Text = "开始称重";
             this.startWeigh.UseVisualStyleBackColor = false;
@@ -367,11 +357,12 @@
             this.weightedNum.BackColor = System.Drawing.Color.White;
             this.weightedNum.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.weightedNum.ID = null;
-            this.weightedNum.Location = new System.Drawing.Point(1122, 248);
+            this.weightedNum.Location = new System.Drawing.Point(997, 207);
+            this.weightedNum.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.weightedNum.Name = "weightedNum";
             this.weightedNum.Negative = false;
             this.weightedNum.Power = null;
-            this.weightedNum.Size = new System.Drawing.Size(196, 28);
+            this.weightedNum.Size = new System.Drawing.Size(175, 25);
             this.weightedNum.Str = null;
             this.weightedNum.Str1 = null;
             this.weightedNum.Str2 = null;
@@ -383,10 +374,10 @@
             this.PA_PACKAGEQTY.AutoSize = true;
             this.PA_PACKAGEQTY.CutLength = null;
             this.PA_PACKAGEQTY.Font = new System.Drawing.Font("微软雅黑", 15F);
-            this.PA_PACKAGEQTY.Location = new System.Drawing.Point(560, 378);
-            this.PA_PACKAGEQTY.MaximumSize = new System.Drawing.Size(200, 0);
+            this.PA_PACKAGEQTY.Location = new System.Drawing.Point(498, 315);
+            this.PA_PACKAGEQTY.MaximumSize = new System.Drawing.Size(178, 0);
             this.PA_PACKAGEQTY.Name = "PA_PACKAGEQTY";
-            this.PA_PACKAGEQTY.Size = new System.Drawing.Size(0, 39);
+            this.PA_PACKAGEQTY.Size = new System.Drawing.Size(0, 32);
             this.PA_PACKAGEQTY.TabIndex = 184;
             // 
             // pa_salecode
@@ -394,10 +385,10 @@
             this.pa_salecode.AutoSize = true;
             this.pa_salecode.CutLength = null;
             this.pa_salecode.Font = new System.Drawing.Font("微软雅黑", 15F);
-            this.pa_salecode.Location = new System.Drawing.Point(560, 316);
-            this.pa_salecode.MaximumSize = new System.Drawing.Size(200, 0);
+            this.pa_salecode.Location = new System.Drawing.Point(498, 263);
+            this.pa_salecode.MaximumSize = new System.Drawing.Size(178, 0);
             this.pa_salecode.Name = "pa_salecode";
-            this.pa_salecode.Size = new System.Drawing.Size(0, 39);
+            this.pa_salecode.Size = new System.Drawing.Size(0, 32);
             this.pa_salecode.TabIndex = 183;
             // 
             // pa_prodcode
@@ -405,10 +396,10 @@
             this.pa_prodcode.AutoSize = true;
             this.pa_prodcode.CutLength = null;
             this.pa_prodcode.Font = new System.Drawing.Font("微软雅黑", 15F);
-            this.pa_prodcode.Location = new System.Drawing.Point(176, 446);
-            this.pa_prodcode.MaximumSize = new System.Drawing.Size(200, 0);
+            this.pa_prodcode.Location = new System.Drawing.Point(156, 372);
+            this.pa_prodcode.MaximumSize = new System.Drawing.Size(178, 0);
             this.pa_prodcode.Name = "pa_prodcode";
-            this.pa_prodcode.Size = new System.Drawing.Size(0, 39);
+            this.pa_prodcode.Size = new System.Drawing.Size(0, 32);
             this.pa_prodcode.TabIndex = 181;
             this.pa_prodcode.TextChanged += new System.EventHandler(this.pa_prodcode_TextChanged);
             // 
@@ -417,10 +408,10 @@
             this.pa_totalqty.AutoSize = true;
             this.pa_totalqty.CutLength = null;
             this.pa_totalqty.Font = new System.Drawing.Font("微软雅黑", 15F);
-            this.pa_totalqty.Location = new System.Drawing.Point(176, 378);
-            this.pa_totalqty.MaximumSize = new System.Drawing.Size(200, 0);
+            this.pa_totalqty.Location = new System.Drawing.Point(156, 315);
+            this.pa_totalqty.MaximumSize = new System.Drawing.Size(178, 0);
             this.pa_totalqty.Name = "pa_totalqty";
-            this.pa_totalqty.Size = new System.Drawing.Size(0, 39);
+            this.pa_totalqty.Size = new System.Drawing.Size(0, 32);
             this.pa_totalqty.TabIndex = 180;
             // 
             // pa_makecode
@@ -428,10 +419,10 @@
             this.pa_makecode.AutoSize = true;
             this.pa_makecode.CutLength = null;
             this.pa_makecode.Font = new System.Drawing.Font("微软雅黑", 15F);
-            this.pa_makecode.Location = new System.Drawing.Point(176, 316);
-            this.pa_makecode.MaximumSize = new System.Drawing.Size(200, 0);
+            this.pa_makecode.Location = new System.Drawing.Point(156, 263);
+            this.pa_makecode.MaximumSize = new System.Drawing.Size(178, 0);
             this.pa_makecode.Name = "pa_makecode";
-            this.pa_makecode.Size = new System.Drawing.Size(0, 39);
+            this.pa_makecode.Size = new System.Drawing.Size(0, 32);
             this.pa_makecode.TabIndex = 179;
             // 
             // printNum
@@ -440,11 +431,12 @@
             this.printNum.BackColor = System.Drawing.Color.White;
             this.printNum.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.printNum.ID = null;
-            this.printNum.Location = new System.Drawing.Point(1122, 171);
+            this.printNum.Location = new System.Drawing.Point(997, 142);
+            this.printNum.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.printNum.Name = "printNum";
             this.printNum.Negative = false;
             this.printNum.Power = null;
-            this.printNum.Size = new System.Drawing.Size(196, 28);
+            this.printNum.Size = new System.Drawing.Size(175, 25);
             this.printNum.Str = null;
             this.printNum.Str1 = null;
             this.printNum.Str2 = null;
@@ -454,19 +446,20 @@
             // OperateResult
             // 
             this.OperateResult.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.OperateResult.Location = new System.Drawing.Point(33, 574);
+            this.OperateResult.Location = new System.Drawing.Point(29, 478);
+            this.OperateResult.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.OperateResult.Name = "OperateResult";
-            this.OperateResult.Size = new System.Drawing.Size(662, 310);
+            this.OperateResult.Size = new System.Drawing.Size(589, 259);
             this.OperateResult.TabIndex = 175;
             this.OperateResult.Text = "";
             // 
             // Printer
             // 
             this.Printer.Font = new System.Drawing.Font("宋体", 9F);
-            this.Printer.Location = new System.Drawing.Point(1122, 24);
-            this.Printer.Margin = new System.Windows.Forms.Padding(6);
+            this.Printer.Location = new System.Drawing.Point(997, 20);
+            this.Printer.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
             this.Printer.Name = "Printer";
-            this.Printer.Size = new System.Drawing.Size(196, 33);
+            this.Printer.Size = new System.Drawing.Size(174, 27);
             this.Printer.TabIndex = 163;
             // 
             // palletcode
@@ -475,11 +468,11 @@
             this.palletcode.BackColor = System.Drawing.Color.White;
             this.palletcode.Font = new System.Drawing.Font("微软雅黑", 18F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.palletcode.ID = null;
-            this.palletcode.Location = new System.Drawing.Point(183, 14);
-            this.palletcode.Margin = new System.Windows.Forms.Padding(4);
+            this.palletcode.Location = new System.Drawing.Point(163, 12);
+            this.palletcode.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.palletcode.Name = "palletcode";
             this.palletcode.Power = null;
-            this.palletcode.Size = new System.Drawing.Size(416, 55);
+            this.palletcode.Size = new System.Drawing.Size(370, 47);
             this.palletcode.Str = null;
             this.palletcode.Str1 = null;
             this.palletcode.Str2 = null;
@@ -490,16 +483,25 @@
             // 
             this.pr_detailspec.AutoSize = true;
             this.pr_detailspec.Font = new System.Drawing.Font("微软雅黑", 15F);
-            this.pr_detailspec.Location = new System.Drawing.Point(176, 513);
+            this.pr_detailspec.Location = new System.Drawing.Point(156, 427);
             this.pr_detailspec.Name = "pr_detailspec";
-            this.pr_detailspec.Size = new System.Drawing.Size(0, 39);
+            this.pr_detailspec.Size = new System.Drawing.Size(0, 32);
             this.pr_detailspec.TabIndex = 192;
             // 
+            // autoPrint
+            // 
+            this.autoPrint.Checked = false;
+            this.autoPrint.Location = new System.Drawing.Point(874, 263);
+            this.autoPrint.Name = "autoPrint";
+            this.autoPrint.Size = new System.Drawing.Size(125, 34);
+            this.autoPrint.TabIndex = 193;
+            // 
             // Make_PalletWeigh
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1402, 902);
+            this.ClientSize = new System.Drawing.Size(1246, 752);
+            this.Controls.Add(this.autoPrint);
             this.Controls.Add(this.pr_detailspec);
             this.Controls.Add(this.ComList);
             this.Controls.Add(this.showResult);
@@ -522,7 +524,6 @@
             this.Controls.Add(this.label3);
             this.Controls.Add(this.label2);
             this.Controls.Add(this.printNum_label);
-            this.Controls.Add(this.autoPrint);
             this.Controls.Add(this.label1);
             this.Controls.Add(this.Printer_label);
             this.Controls.Add(this.Printer);
@@ -531,15 +532,16 @@
             this.Controls.Add(this.label15);
             this.Controls.Add(this.panel4);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
+            this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.Name = "Make_PalletWeigh";
             this.Tag = "Make!PalletWeigh";
             this.Text = "栈板称重";
             this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.Make_PalletWeigh_FormClosing);
             this.Load += new System.EventHandler(this.Make_PalletWeigh_Load);
             this.SizeChanged += new System.EventHandler(this.Make_PalletWeigh_SizeChanged);
-            this.panel4.ResumeLayout(true);
+            this.panel4.ResumeLayout(false);
             this.panel4.PerformLayout();
-            this.ResumeLayout(true);
+            this.ResumeLayout(false);
             this.PerformLayout();
 
         }
@@ -556,7 +558,6 @@
         private System.Windows.Forms.Label Printer_label;
         private CustomControl.ComBoxWithFocus.PrinterCombox Printer;
         private System.Windows.Forms.ComboBox PrintLabel;
-        private System.Windows.Forms.CheckBox autoPrint;
         private System.Windows.Forms.Label printNum_label;
         private System.Windows.Forms.Label label2;
         private System.Windows.Forms.Label label3;
@@ -583,5 +584,6 @@
         private System.Windows.Forms.ColumnHeader columnHeader4;
         private CustomControl.ValueLabel.ValueLabel ComList;
         private System.Windows.Forms.Label pr_detailspec;
+        private CustomControl.CustomCheckBox.AutoPrintCheckBox autoPrint;
     }
 }

UAS-MES/Main.cs

@@ -1,4 +1,5 @@
-using System;
+using LabelManager2;
+using System;
 using System.Collections.Generic;
 using System.Configuration;
 using System.Diagnostics;
@@ -38,6 +39,8 @@ namespace UAS_MES
 
         Thread thread;
 
+        Thread TestPrint;
+
         string sysdisc = Environment.GetEnvironmentVariable("windir").Substring(0, 1);
 
         public Main()
@@ -59,9 +62,9 @@ namespace UAS_MES
             //保存6天前和今天的操作日志
             for (int i = 1; i <= 30; i++)
             {
-                DeleteFileName.Add(DateTime.Now.AddDays(-i).ToString("yyyy-MM-dd") + ".txt");
+                DeleteFileName.Add(System.DateTime.Now.AddDays(-i).ToString("yyyy-MM-dd") + ".txt");
             }
-            DeleteFileName.Add(DateTime.Now.ToString("yyyy-MM-dd") + ".txt");
+            DeleteFileName.Add(System.DateTime.Now.ToString("yyyy-MM-dd") + ".txt");
             if (dir.Exists)
             {
                 FileInfo[] file = dir.GetFiles();
@@ -75,7 +78,6 @@ namespace UAS_MES
 
         //tabPage标签图片尺寸
         const int CLOSE_SIZE = 16;
-
         //窗体加载的时候将headBar的事件委托给指定的函数
         private void Main_Load(object sender, EventArgs e)
         {
@@ -117,6 +119,8 @@ namespace UAS_MES
             }
             thread = new Thread(DeleteLog);
             thread.Start();
+            TestPrint = new Thread(TestPrintEnable);
+            TestPrint.Start();
             this.Tag = "ShowDialogWindow";
             this.headBar1.MouseDown += new MouseEventHandler(this.headBar_MouseDown);
             this.MainTabControl.DrawMode = TabDrawMode.OwnerDrawFixed;
@@ -142,6 +146,20 @@ namespace UAS_MES
             SystemInf.HeadBarHeight = headBar1.Height;
         }
 
+        private void TestPrintEnable()
+        {
+            try
+            {
+                ApplicationClass lbl = new ApplicationClass();
+                SystemInf.EnablePrint = true;
+                BaseUtil.WriteLbl(lbl);
+            }
+            catch (Exception)
+            {
+                SystemInf.EnablePrint = false;
+            }
+        }
+
         /// <summary>
         ///设置窗体的最大化和最小化状态
         /// </summary>
@@ -280,10 +298,10 @@ namespace UAS_MES
                 //清除已经打开过的窗口的信息
                 AccordionMenu.OpenedFormName.Clear();
                 //注销的时候将除了登陆窗口之外的全部窗口关闭
-                for (int i = 0; i < Application.OpenForms.Count; i++)
+                for (int i = 0; i < System.Windows.Forms.Application.OpenForms.Count; i++)
                 {
-                    if (Application.OpenForms[i].Name != "Login")
-                        Application.OpenForms[i].Close();
+                    if (System.Windows.Forms.Application.OpenForms[i].Name != "Login")
+                        System.Windows.Forms.Application.OpenForms[i].Close();
                 }
                 this.Hide();
                 Login login = new Login();

UAS-MES/PublicForm/SetLoadingWindow.cs

@@ -35,11 +35,18 @@ namespace UAS_MES.PublicForm
 
         private void SetLoadFinish()
         {
-            while (LoadingThread.IsAlive)
+            try
             {
-             
+                while (LoadingThread.IsAlive)
+                {
+
+                }
+                Close();
+            }
+            catch (Exception)
+            {
+                return;
             }
-            Close();
         }
         
         //在进程结束之前不允许此窗体被关闭

UAS-MES/UAS-MES.csproj

@@ -8,7 +8,7 @@
     <OutputType>WinExe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>UAS_MES</RootNamespace>
-    <AssemblyName>UAS_MES</AssemblyName>
+    <AssemblyName>UAS_MES_TEST</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
@@ -22,7 +22,7 @@
     </SccAuxPath>
     <SccProvider>
     </SccProvider>
-    <PublishUrl>ftp://192.168.253.9/MESSetting/</PublishUrl>
+    <PublishUrl>ftp://172.16.11.99/releasetest/</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Web</InstallFrom>
     <UpdateEnabled>true</UpdateEnabled>
@@ -32,17 +32,17 @@
     <UpdatePeriodically>false</UpdatePeriodically>
     <UpdateRequired>true</UpdateRequired>
     <MapFileExtensions>true</MapFileExtensions>
-    <InstallUrl>http://218.17.158.219:8888/</InstallUrl>
+    <InstallUrl>http://172.16.11.99/releasetest/</InstallUrl>
     <UpdateUrl>http://172.16.11.99/</UpdateUrl>
     <TargetCulture>zh</TargetCulture>
-    <ProductName>优软MES系统</ProductName>
+    <ProductName>优软MES系统_TEST</ProductName>
     <PublisherName>深圳市优软科技有限公司</PublisherName>
-    <SuiteName>优软MES系统</SuiteName>
-    <MinimumRequiredVersion>1.0.0.399</MinimumRequiredVersion>
+    <SuiteName>优软MES系统_TEST</SuiteName>
+    <MinimumRequiredVersion>1.0.0.424</MinimumRequiredVersion>
     <CreateWebPageOnPublish>true</CreateWebPageOnPublish>
     <WebPage>publish.htm</WebPage>
     <OpenBrowserOnPublish>false</OpenBrowserOnPublish>
-    <ApplicationRevision>422</ApplicationRevision>
+    <ApplicationRevision>460</ApplicationRevision>
     <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
     <UseApplicationTrust>true</UseApplicationTrust>
     <CreateDesktopShortcut>true</CreateDesktopShortcut>
@@ -60,6 +60,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>0</WarningLevel>
     <UseVSHostingProcess>true</UseVSHostingProcess>
+    <GenerateSerializationAssemblies>Auto</GenerateSerializationAssemblies>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -81,7 +82,7 @@
     <GenerateManifests>true</GenerateManifests>
   </PropertyGroup>
   <PropertyGroup>
-    <SignManifests>true</SignManifests>
+    <SignManifests>false</SignManifests>
   </PropertyGroup>
   <PropertyGroup>
     <StartupObject>UAS_MES.Program</StartupObject>
@@ -222,6 +223,12 @@
     <Compile Include="CustomControl\ComBoxWithFocus\SerialPortCombox.Designer.cs">
       <DependentUpon>SerialPortCombox.cs</DependentUpon>
     </Compile>
+    <Compile Include="CustomControl\CustomCheckBox\AutoPrintCheckBox.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="CustomControl\CustomCheckBox\AutoPrintCheckBox.Designer.cs">
+      <DependentUpon>AutoPrintCheckBox.cs</DependentUpon>
+    </Compile>
     <Compile Include="CustomControl\CustomCheckBox\LockCheckBox.cs">
       <SubType>Component</SubType>
     </Compile>
@@ -416,6 +423,12 @@
     <Compile Include="Form1.Designer.cs">
       <DependentUpon>Form1.cs</DependentUpon>
     </Compile>
+    <Compile Include="FunctionCode\Make\Make_BigBoxCollection.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="FunctionCode\Make\Make_BigBoxCollection.Designer.cs">
+      <DependentUpon>Make_BigBoxCollection.cs</DependentUpon>
+    </Compile>
     <Compile Include="FunctionCode\Make\Make_BigBoxWeight.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -470,6 +483,12 @@
     <Compile Include="FunctionCode\Make\Make_NewMatainInf.Designer.cs">
       <DependentUpon>Make_NewMatainInf.cs</DependentUpon>
     </Compile>
+    <Compile Include="FunctionCode\Make\Make_NewPallet.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="FunctionCode\Make\Make_NewPallet.Designer.cs">
+      <DependentUpon>Make_NewPallet.cs</DependentUpon>
+    </Compile>
     <Compile Include="FunctionCode\Make\Make_PalletCollection.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -647,11 +666,11 @@
     <Compile Include="FunctionCode\Make\Make_ColorBoxWeigh.Designer.cs">
       <DependentUpon>Make_ColorBoxWeigh.cs</DependentUpon>
     </Compile>
-    <Compile Include="FunctionCode\Make\Make_NewPallet.cs">
+    <Compile Include="FunctionCode\Make\Make_NewBigBox.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="FunctionCode\Make\Make_NewPallet.Designer.cs">
-      <DependentUpon>Make_NewPallet.cs</DependentUpon>
+    <Compile Include="FunctionCode\Make\Make_NewBigBox.Designer.cs">
+      <DependentUpon>Make_NewBigBox.cs</DependentUpon>
     </Compile>
     <Compile Include="FunctionCode\Make\Make_ColorBoxLoadPrint.cs">
       <SubType>Form</SubType>
@@ -858,6 +877,9 @@
     <EmbeddedResource Include="CustomControl\ComBoxWithFocus\SerialPortCombox.resx">
       <DependentUpon>SerialPortCombox.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="CustomControl\CustomCheckBox\AutoPrintCheckBox.resx">
+      <DependentUpon>AutoPrintCheckBox.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="CustomControl\CustomCheckBox\LockCheckBox.resx">
       <DependentUpon>LockCheckBox.cs</DependentUpon>
     </EmbeddedResource>
@@ -927,6 +949,9 @@
     <EmbeddedResource Include="Form1.resx">
       <DependentUpon>Form1.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="FunctionCode\Make\Make_BigBoxCollection.resx">
+      <DependentUpon>Make_BigBoxCollection.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="FunctionCode\Make\Make_BigBoxWeight.resx">
       <DependentUpon>Make_BigBoxWeight.cs</DependentUpon>
     </EmbeddedResource>
@@ -954,6 +979,9 @@
     <EmbeddedResource Include="FunctionCode\Make\Make_NewMatainInf.resx">
       <DependentUpon>Make_NewMatainInf.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="FunctionCode\Make\Make_NewPallet.resx">
+      <DependentUpon>Make_NewPallet.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="FunctionCode\Make\Make_PalletCollection.resx">
       <DependentUpon>Make_PalletCollection.cs</DependentUpon>
     </EmbeddedResource>
@@ -1037,8 +1065,8 @@
     <EmbeddedResource Include="FunctionCode\Make\Make_ColorBoxWeigh.resx">
       <DependentUpon>Make_ColorBoxWeigh.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="FunctionCode\Make\Make_NewPallet.resx">
-      <DependentUpon>Make_NewPallet.cs</DependentUpon>
+    <EmbeddedResource Include="FunctionCode\Make\Make_NewBigBox.resx">
+      <DependentUpon>Make_NewBigBox.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="FunctionCode\Make\Make_ColorBoxLoadPrint.resx">
       <DependentUpon>Make_ColorBoxLoadPrint.cs</DependentUpon>
@@ -1159,6 +1187,7 @@
     <Content Include="Resources\Sound\3291.wav" />
     <Content Include="Resources\Sound\5185.wav" />
     <Content Include="Resources\Sound\8378.wav" />
+    <None Include="Resources\WhiteImage.png" />
     <Content Include="U_Icon.ico" />
     <None Include="Resources\timg.jpg" />
     <None Include="Resources\matte_white_square_icon_business_tool_hammer_128px_571061_easyicon.net.ico" />

UAS_WinForm.sln

@@ -1,10 +1,8 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
-VisualStudioVersion = 14.0.24720.0
+VisualStudioVersion = 14.0.23107.0
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UAS-MES接口", "MES接口\UAS-MES接口.csproj", "{A52EFE9C-838E-4E8C-BAAA-B1C226E57A81}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UAS-MES", "UAS-MES\UAS-MES.csproj", "{411DEE44-B893-47E0-A0C2-797A3DAE2466}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UAS-出货标签管理", "UAS-出货标签管理\UAS-出货标签管理.csproj", "{AF6321B6-3B55-4756-8B0B-110354A7BC1E}"
@@ -17,46 +15,102 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UAS_XmlAnalysor", "UAS_XmlA
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UAS_KanBan", "UAS_KanBan\UAS_KanBan.csproj", "{13FB3DAF-E684-4B04-9F35-710F925A64C3}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UAS_MesInterface", "UAS_MesInterface\UAS_MesInterface.csproj", "{0516B4B2-6F50-4495-8785-3B813570682B}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UAS_MesDllService", "UAS_MesInterface\UAS_MesDllService.csproj", "{0516B4B2-6F50-4495-8785-3B813570682B}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
 		Release|Any CPU = Release|Any CPU
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{A52EFE9C-838E-4E8C-BAAA-B1C226E57A81}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A52EFE9C-838E-4E8C-BAAA-B1C226E57A81}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A52EFE9C-838E-4E8C-BAAA-B1C226E57A81}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A52EFE9C-838E-4E8C-BAAA-B1C226E57A81}.Release|Any CPU.Build.0 = Release|Any CPU
 		{411DEE44-B893-47E0-A0C2-797A3DAE2466}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{411DEE44-B893-47E0-A0C2-797A3DAE2466}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{411DEE44-B893-47E0-A0C2-797A3DAE2466}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{411DEE44-B893-47E0-A0C2-797A3DAE2466}.Debug|x64.Build.0 = Debug|Any CPU
+		{411DEE44-B893-47E0-A0C2-797A3DAE2466}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{411DEE44-B893-47E0-A0C2-797A3DAE2466}.Debug|x86.Build.0 = Debug|Any CPU
 		{411DEE44-B893-47E0-A0C2-797A3DAE2466}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{411DEE44-B893-47E0-A0C2-797A3DAE2466}.Release|Any CPU.Build.0 = Release|Any CPU
+		{411DEE44-B893-47E0-A0C2-797A3DAE2466}.Release|x64.ActiveCfg = Release|Any CPU
+		{411DEE44-B893-47E0-A0C2-797A3DAE2466}.Release|x64.Build.0 = Release|Any CPU
+		{411DEE44-B893-47E0-A0C2-797A3DAE2466}.Release|x86.ActiveCfg = Release|Any CPU
+		{411DEE44-B893-47E0-A0C2-797A3DAE2466}.Release|x86.Build.0 = Release|Any CPU
 		{AF6321B6-3B55-4756-8B0B-110354A7BC1E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{AF6321B6-3B55-4756-8B0B-110354A7BC1E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AF6321B6-3B55-4756-8B0B-110354A7BC1E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{AF6321B6-3B55-4756-8B0B-110354A7BC1E}.Debug|x64.Build.0 = Debug|Any CPU
+		{AF6321B6-3B55-4756-8B0B-110354A7BC1E}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{AF6321B6-3B55-4756-8B0B-110354A7BC1E}.Debug|x86.Build.0 = Debug|Any CPU
 		{AF6321B6-3B55-4756-8B0B-110354A7BC1E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{AF6321B6-3B55-4756-8B0B-110354A7BC1E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AF6321B6-3B55-4756-8B0B-110354A7BC1E}.Release|x64.ActiveCfg = Release|Any CPU
+		{AF6321B6-3B55-4756-8B0B-110354A7BC1E}.Release|x64.Build.0 = Release|Any CPU
+		{AF6321B6-3B55-4756-8B0B-110354A7BC1E}.Release|x86.ActiveCfg = Release|Any CPU
+		{AF6321B6-3B55-4756-8B0B-110354A7BC1E}.Release|x86.Build.0 = Release|Any CPU
 		{92488A73-91D7-4797-9794-67C4D9D86D09}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{92488A73-91D7-4797-9794-67C4D9D86D09}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{92488A73-91D7-4797-9794-67C4D9D86D09}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{92488A73-91D7-4797-9794-67C4D9D86D09}.Debug|x64.Build.0 = Debug|Any CPU
+		{92488A73-91D7-4797-9794-67C4D9D86D09}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{92488A73-91D7-4797-9794-67C4D9D86D09}.Debug|x86.Build.0 = Debug|Any CPU
 		{92488A73-91D7-4797-9794-67C4D9D86D09}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{92488A73-91D7-4797-9794-67C4D9D86D09}.Release|Any CPU.Build.0 = Release|Any CPU
+		{92488A73-91D7-4797-9794-67C4D9D86D09}.Release|x64.ActiveCfg = Release|Any CPU
+		{92488A73-91D7-4797-9794-67C4D9D86D09}.Release|x64.Build.0 = Release|Any CPU
+		{92488A73-91D7-4797-9794-67C4D9D86D09}.Release|x86.ActiveCfg = Release|Any CPU
+		{92488A73-91D7-4797-9794-67C4D9D86D09}.Release|x86.Build.0 = Release|Any CPU
 		{7D199649-095F-4280-BD82-9481BCAB85B4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{7D199649-095F-4280-BD82-9481BCAB85B4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7D199649-095F-4280-BD82-9481BCAB85B4}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{7D199649-095F-4280-BD82-9481BCAB85B4}.Debug|x64.Build.0 = Debug|Any CPU
+		{7D199649-095F-4280-BD82-9481BCAB85B4}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{7D199649-095F-4280-BD82-9481BCAB85B4}.Debug|x86.Build.0 = Debug|Any CPU
 		{7D199649-095F-4280-BD82-9481BCAB85B4}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7D199649-095F-4280-BD82-9481BCAB85B4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7D199649-095F-4280-BD82-9481BCAB85B4}.Release|x64.ActiveCfg = Release|Any CPU
+		{7D199649-095F-4280-BD82-9481BCAB85B4}.Release|x64.Build.0 = Release|Any CPU
+		{7D199649-095F-4280-BD82-9481BCAB85B4}.Release|x86.ActiveCfg = Release|Any CPU
+		{7D199649-095F-4280-BD82-9481BCAB85B4}.Release|x86.Build.0 = Release|Any CPU
 		{7767BBB5-6E7E-4687-A9D6-6C6E9B6F4EA3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{7767BBB5-6E7E-4687-A9D6-6C6E9B6F4EA3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7767BBB5-6E7E-4687-A9D6-6C6E9B6F4EA3}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{7767BBB5-6E7E-4687-A9D6-6C6E9B6F4EA3}.Debug|x64.Build.0 = Debug|Any CPU
+		{7767BBB5-6E7E-4687-A9D6-6C6E9B6F4EA3}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{7767BBB5-6E7E-4687-A9D6-6C6E9B6F4EA3}.Debug|x86.Build.0 = Debug|Any CPU
 		{7767BBB5-6E7E-4687-A9D6-6C6E9B6F4EA3}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7767BBB5-6E7E-4687-A9D6-6C6E9B6F4EA3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7767BBB5-6E7E-4687-A9D6-6C6E9B6F4EA3}.Release|x64.ActiveCfg = Release|Any CPU
+		{7767BBB5-6E7E-4687-A9D6-6C6E9B6F4EA3}.Release|x64.Build.0 = Release|Any CPU
+		{7767BBB5-6E7E-4687-A9D6-6C6E9B6F4EA3}.Release|x86.ActiveCfg = Release|Any CPU
+		{7767BBB5-6E7E-4687-A9D6-6C6E9B6F4EA3}.Release|x86.Build.0 = Release|Any CPU
 		{13FB3DAF-E684-4B04-9F35-710F925A64C3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{13FB3DAF-E684-4B04-9F35-710F925A64C3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{13FB3DAF-E684-4B04-9F35-710F925A64C3}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{13FB3DAF-E684-4B04-9F35-710F925A64C3}.Debug|x64.Build.0 = Debug|Any CPU
+		{13FB3DAF-E684-4B04-9F35-710F925A64C3}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{13FB3DAF-E684-4B04-9F35-710F925A64C3}.Debug|x86.Build.0 = Debug|Any CPU
 		{13FB3DAF-E684-4B04-9F35-710F925A64C3}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{13FB3DAF-E684-4B04-9F35-710F925A64C3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{13FB3DAF-E684-4B04-9F35-710F925A64C3}.Release|x64.ActiveCfg = Release|Any CPU
+		{13FB3DAF-E684-4B04-9F35-710F925A64C3}.Release|x64.Build.0 = Release|Any CPU
+		{13FB3DAF-E684-4B04-9F35-710F925A64C3}.Release|x86.ActiveCfg = Release|Any CPU
+		{13FB3DAF-E684-4B04-9F35-710F925A64C3}.Release|x86.Build.0 = Release|Any CPU
 		{0516B4B2-6F50-4495-8785-3B813570682B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{0516B4B2-6F50-4495-8785-3B813570682B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0516B4B2-6F50-4495-8785-3B813570682B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{0516B4B2-6F50-4495-8785-3B813570682B}.Debug|x64.Build.0 = Debug|Any CPU
+		{0516B4B2-6F50-4495-8785-3B813570682B}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{0516B4B2-6F50-4495-8785-3B813570682B}.Debug|x86.Build.0 = Debug|Any CPU
 		{0516B4B2-6F50-4495-8785-3B813570682B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{0516B4B2-6F50-4495-8785-3B813570682B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0516B4B2-6F50-4495-8785-3B813570682B}.Release|x64.ActiveCfg = Release|Any CPU
+		{0516B4B2-6F50-4495-8785-3B813570682B}.Release|x64.Build.0 = Release|Any CPU
+		{0516B4B2-6F50-4495-8785-3B813570682B}.Release|x86.ActiveCfg = Release|Any CPU
+		{0516B4B2-6F50-4495-8785-3B813570682B}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE