Merge remote-tracking branch 'refs/remotes/origin/master'

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/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/FunctionCode/Make/Make_BigBoxCollection.Designer.cs

@@ -30,8 +30,9 @@
         {
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Make_BigBoxCollection));
             this.pa_outboxcode_label = new System.Windows.Forms.Label();
-            this.pa_currentqty_label = new System.Windows.Forms.Label();
+            this.pa_totalqty_label = new System.Windows.Forms.Label();
             this.pa_makecode_label = new System.Windows.Forms.Label();
+            this.AutoPrint = new System.Windows.Forms.CheckBox();
             this.pa_restqty_label = new System.Windows.Forms.Label();
             this.pa_custcode_label = new System.Windows.Forms.Label();
             this.palletcode_label = new System.Windows.Forms.Label();
@@ -58,12 +59,11 @@
             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_standardqty = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
+            this.pa_packageqty = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
             this.pa_outboxcode = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
-            this.pa_currentqty = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
-            this.pa_standardqty_label = new System.Windows.Forms.Label();
+            this.pa_totalqty = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
+            this.pa_packageqty_label = new System.Windows.Forms.Label();
             this.Packing = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
-            this.AutoPrint = new UAS_MES.CustomControl.CustomCheckBox.AutoPrintCheckBox();
             ((System.ComponentModel.ISupportInitialize)(this.PrintNum)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.PackageInf)).BeginInit();
             this.SuspendLayout();
@@ -72,43 +72,57 @@
             // 
             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(27, 34);
+            this.pa_outboxcode_label.Location = new System.Drawing.Point(30, 41);
             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(52, 27);
+            this.pa_outboxcode_label.Size = new System.Drawing.Size(62, 31);
             this.pa_outboxcode_label.TabIndex = 102;
             this.pa_outboxcode_label.Text = "箱号";
             // 
-            // pa_currentqty_label
+            // pa_totalqty_label
             // 
-            this.pa_currentqty_label.AutoSize = true;
-            this.pa_currentqty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pa_currentqty_label.Location = new System.Drawing.Point(313, 96);
-            this.pa_currentqty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.pa_currentqty_label.Name = "pa_currentqty_label";
-            this.pa_currentqty_label.Size = new System.Drawing.Size(92, 27);
-            this.pa_currentqty_label.TabIndex = 104;
-            this.pa_currentqty_label.Text = "已装数量";
+            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.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.TabIndex = 104;
+            this.pa_totalqty_label.Text = "已装数量";
             // 
             // pa_makecode_label
             // 
             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(313, 34);
+            this.pa_makecode_label.Location = new System.Drawing.Point(352, 41);
             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(92, 27);
+            this.pa_makecode_label.Size = new System.Drawing.Size(110, 31);
             this.pa_makecode_label.TabIndex = 108;
             this.pa_makecode_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("微软雅黑", 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.Name = "AutoPrint";
+            this.AutoPrint.Size = new System.Drawing.Size(184, 35);
+            this.AutoPrint.TabIndex = 153;
+            this.AutoPrint.Text = "满箱自动打印";
+            this.AutoPrint.UseVisualStyleBackColor = true;
+            // 
             // pa_restqty_label
             // 
             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(980, 160);
+            this.pa_restqty_label.Location = new System.Drawing.Point(1102, 192);
             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(92, 27);
+            this.pa_restqty_label.Size = new System.Drawing.Size(110, 31);
             this.pa_restqty_label.TabIndex = 154;
             this.pa_restqty_label.Text = "打印张数";
             // 
@@ -116,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(980, 34);
+            this.pa_custcode_label.Location = new System.Drawing.Point(1102, 41);
             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(52, 27);
+            this.pa_custcode_label.Size = new System.Drawing.Size(62, 31);
             this.pa_custcode_label.TabIndex = 157;
             this.pa_custcode_label.Text = "客户";
             // 
@@ -127,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(980, 339);
+            this.palletcode_label.Location = new System.Drawing.Point(1102, 407);
             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(72, 27);
+            this.palletcode_label.Size = new System.Drawing.Size(86, 31);
             this.palletcode_label.TabIndex = 165;
             this.palletcode_label.Text = "大箱号";
             // 
@@ -138,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(980, 394);
+            this.outboxcode_label.Location = new System.Drawing.Point(1102, 473);
             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(92, 27);
+            this.outboxcode_label.Size = new System.Drawing.Size(110, 31);
             this.outboxcode_label.TabIndex = 166;
             this.outboxcode_label.Text = "卡通箱号";
             // 
@@ -149,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(604, 34);
+            this.pa_prodcode_label.Location = new System.Drawing.Point(680, 41);
             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(92, 27);
+            this.pa_prodcode_label.Size = new System.Drawing.Size(110, 31);
             this.pa_prodcode_label.TabIndex = 169;
             this.pa_prodcode_label.Text = "产品编号";
             // 
@@ -160,20 +174,20 @@
             // 
             this.PrintLabel.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.PrintLabel.FormattingEnabled = true;
-            this.PrintLabel.Location = new System.Drawing.Point(1105, 101);
+            this.PrintLabel.Location = new System.Drawing.Point(1243, 121);
             this.PrintLabel.Margin = new System.Windows.Forms.Padding(3, 1, 3, 1);
             this.PrintLabel.Name = "PrintLabel";
-            this.PrintLabel.Size = new System.Drawing.Size(195, 23);
+            this.PrintLabel.Size = new System.Drawing.Size(219, 26);
             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(980, 99);
+            this.PrintLabel_label.Location = new System.Drawing.Point(1102, 119);
             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(92, 27);
+            this.PrintLabel_label.Size = new System.Drawing.Size(110, 31);
             this.PrintLabel_label.TabIndex = 174;
             this.PrintLabel_label.Text = "标签文件";
             // 
@@ -181,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(604, 99);
+            this.PrinterList_label.Location = new System.Drawing.Point(680, 119);
             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(112, 27);
+            this.PrinterList_label.Size = new System.Drawing.Size(134, 31);
             this.PrinterList_label.TabIndex = 173;
             this.PrinterList_label.Text = "打印机列表";
             // 
             // PrintNum
             // 
-            this.PrintNum.Location = new System.Drawing.Point(1105, 161);
-            this.PrintNum.Margin = new System.Windows.Forms.Padding(4);
+            this.PrintNum.Location = new System.Drawing.Point(1243, 193);
+            this.PrintNum.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.PrintNum.Name = "PrintNum";
-            this.PrintNum.Size = new System.Drawing.Size(196, 25);
+            this.PrintNum.Size = new System.Drawing.Size(220, 28);
             this.PrintNum.TabIndex = 175;
             this.PrintNum.Value = new decimal(new int[] {
             1,
@@ -203,10 +217,10 @@
             // 
             // PrinterList
             // 
-            this.PrinterList.Location = new System.Drawing.Point(751, 99);
-            this.PrinterList.Margin = new System.Windows.Forms.Padding(5);
+            this.PrinterList.Location = new System.Drawing.Point(845, 119);
+            this.PrinterList.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.PrinterList.Name = "PrinterList";
-            this.PrinterList.Size = new System.Drawing.Size(195, 25);
+            this.PrinterList.Size = new System.Drawing.Size(219, 30);
             this.PrinterList.TabIndex = 171;
             // 
             // pa_prodcode
@@ -214,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(745, 34);
+            this.pa_prodcode.Location = new System.Drawing.Point(838, 41);
             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.MaximumSize = new System.Drawing.Size(225, 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, 31);
             this.pa_prodcode.TabIndex = 170;
             this.pa_prodcode.Tag = "1";
             // 
@@ -229,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(1105, 651);
-            this.Clean.Margin = new System.Windows.Forms.Padding(4);
+            this.Clean.Location = new System.Drawing.Point(1243, 768);
+            this.Clean.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             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(80, 30);
+            this.Clean.Size = new System.Drawing.Size(90, 36);
             this.Clean.TabIndex = 168;
             this.Clean.Text = "清除";
             this.Clean.UseVisualStyleBackColor = true;
@@ -244,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(953, 434);
-            this.OperateResult.Margin = new System.Windows.Forms.Padding(4);
+            this.OperateResult.Location = new System.Drawing.Point(1072, 521);
+            this.OperateResult.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.OperateResult.Name = "OperateResult";
-            this.OperateResult.Size = new System.Drawing.Size(368, 208);
+            this.OperateResult.Size = new System.Drawing.Size(414, 237);
             this.OperateResult.TabIndex = 167;
             this.OperateResult.Text = "";
             // 
@@ -256,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(1105, 394);
-            this.outboxcode.Margin = new System.Windows.Forms.Padding(4);
+            this.outboxcode.Location = new System.Drawing.Point(1243, 473);
+            this.outboxcode.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.outboxcode.Name = "outboxcode";
             this.outboxcode.Power = "ifwrite";
-            this.outboxcode.Size = new System.Drawing.Size(195, 25);
+            this.outboxcode.Size = new System.Drawing.Size(219, 28);
             this.outboxcode.Str = null;
             this.outboxcode.Str1 = null;
             this.outboxcode.Str2 = null;
@@ -273,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(1105, 339);
-            this.bigoutboxcode.Margin = new System.Windows.Forms.Padding(4);
+            this.bigoutboxcode.Location = new System.Drawing.Point(1243, 407);
+            this.bigoutboxcode.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.bigoutboxcode.Name = "bigoutboxcode";
             this.bigoutboxcode.Power = "ifwrite";
-            this.bigoutboxcode.Size = new System.Drawing.Size(195, 25);
+            this.bigoutboxcode.Size = new System.Drawing.Size(219, 28);
             this.bigoutboxcode.Str = null;
             this.bigoutboxcode.Str1 = null;
             this.bigoutboxcode.Str2 = null;
@@ -292,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(1159, 246);
-            this.Printlab.Margin = new System.Windows.Forms.Padding(4);
+            this.Printlab.Location = new System.Drawing.Point(1304, 295);
+            this.Printlab.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             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(80, 30);
+            this.Printlab.Size = new System.Drawing.Size(90, 36);
             this.Printlab.TabIndex = 161;
             this.Printlab.Text = "打印";
             this.Printlab.UseVisualStyleBackColor = true;
@@ -311,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(1027, 291);
-            this.ReleasePallet.Margin = new System.Windows.Forms.Padding(4);
+            this.ReleasePallet.Location = new System.Drawing.Point(1155, 349);
+            this.ReleasePallet.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             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(80, 30);
+            this.ReleasePallet.Size = new System.Drawing.Size(90, 36);
             this.ReleasePallet.TabIndex = 160;
             this.ReleasePallet.Text = "解除大箱";
             this.ReleasePallet.UseVisualStyleBackColor = true;
@@ -330,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(1027, 246);
-            this.NewPallet.Margin = new System.Windows.Forms.Padding(4);
+            this.NewPallet.Location = new System.Drawing.Point(1155, 295);
+            this.NewPallet.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             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(80, 30);
+            this.NewPallet.Size = new System.Drawing.Size(90, 36);
             this.NewPallet.TabIndex = 159;
             this.NewPallet.Text = "新增大箱";
             this.NewPallet.UseVisualStyleBackColor = true;
@@ -347,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(1105, 34);
+            this.pa_custcode.Location = new System.Drawing.Point(1243, 41);
             this.pa_custcode.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.pa_custcode.MaximumSize = new System.Drawing.Size(200, 0);
+            this.pa_custcode.MaximumSize = new System.Drawing.Size(225, 0);
             this.pa_custcode.Name = "pa_custcode";
-            this.pa_custcode.Size = new System.Drawing.Size(0, 27);
+            this.pa_custcode.Size = new System.Drawing.Size(0, 31);
             this.pa_custcode.TabIndex = 158;
             this.pa_custcode.Tag = "1";
             // 
@@ -365,11 +379,11 @@
             this.Column3,
             this.Column4,
             this.Column5});
-            this.PackageInf.Location = new System.Drawing.Point(4, 161);
-            this.PackageInf.Margin = new System.Windows.Forms.Padding(4);
+            this.PackageInf.Location = new System.Drawing.Point(4, 193);
+            this.PackageInf.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.PackageInf.Name = "PackageInf";
             this.PackageInf.RowTemplate.Height = 23;
-            this.PackageInf.Size = new System.Drawing.Size(941, 519);
+            this.PackageInf.Size = new System.Drawing.Size(1059, 623);
             this.PackageInf.TabIndex = 156;
             // 
             // pd_outboxcode
@@ -413,63 +427,63 @@
             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(439, 34);
+            this.pa_makecode.Location = new System.Drawing.Point(494, 41);
             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.MaximumSize = new System.Drawing.Size(225, 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, 31);
             this.pa_makecode.TabIndex = 109;
             this.pa_makecode.Tag = "1";
             // 
-            // pa_standardqty
+            // pa_packageqty
             // 
-            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";
+            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";
             // 
             // 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(157, 34);
+            this.pa_outboxcode.Location = new System.Drawing.Point(177, 41);
             this.pa_outboxcode.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.pa_outboxcode.MaximumSize = new System.Drawing.Size(200, 0);
+            this.pa_outboxcode.MaximumSize = new System.Drawing.Size(225, 0);
             this.pa_outboxcode.Name = "pa_outboxcode";
-            this.pa_outboxcode.Size = new System.Drawing.Size(0, 27);
+            this.pa_outboxcode.Size = new System.Drawing.Size(0, 31);
             this.pa_outboxcode.TabIndex = 103;
             this.pa_outboxcode.Tag = "1";
             // 
-            // pa_currentqty
-            // 
-            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_standardqty_label
-            // 
-            this.pa_standardqty_label.AutoSize = true;
-            this.pa_standardqty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pa_standardqty_label.Location = new System.Drawing.Point(27, 96);
-            this.pa_standardqty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.pa_standardqty_label.Name = "pa_standardqty_label";
-            this.pa_standardqty_label.Size = new System.Drawing.Size(92, 27);
-            this.pa_standardqty_label.TabIndex = 176;
-            this.pa_standardqty_label.Text = "箱内容量";
+            // pa_totalqty
+            // 
+            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";
+            // 
+            // 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.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.TabIndex = 176;
+            this.pa_packageqty_label.Text = "箱内容量";
             // 
             // Packing
             // 
@@ -478,35 +492,26 @@
             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(1159, 291);
-            this.Packing.Margin = new System.Windows.Forms.Padding(4);
+            this.Packing.Location = new System.Drawing.Point(1304, 349);
+            this.Packing.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             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(80, 30);
+            this.Packing.Size = new System.Drawing.Size(90, 36);
             this.Packing.TabIndex = 178;
             this.Packing.Text = "装箱";
             this.Packing.UseVisualStyleBackColor = true;
             this.Packing.Click += new System.EventHandler(this.Packing_Click);
             // 
-            // AutoPrint
-            // 
-            this.AutoPrint.Checked = false;
-            this.AutoPrint.Location = new System.Drawing.Point(985, 205);
-            this.AutoPrint.Name = "AutoPrint";
-            this.AutoPrint.Size = new System.Drawing.Size(125, 34);
-            this.AutoPrint.TabIndex = 179;
-            // 
             // Make_BigBoxCollection
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1329, 690);
-            this.Controls.Add(this.AutoPrint);
+            this.ClientSize = new System.Drawing.Size(1495, 828);
             this.Controls.Add(this.Packing);
-            this.Controls.Add(this.pa_currentqty);
-            this.Controls.Add(this.pa_standardqty_label);
+            this.Controls.Add(this.pa_totalqty);
+            this.Controls.Add(this.pa_packageqty_label);
             this.Controls.Add(this.PrintNum);
             this.Controls.Add(this.PrintLabel_label);
             this.Controls.Add(this.PrinterList_label);
@@ -527,14 +532,15 @@
             this.Controls.Add(this.pa_custcode_label);
             this.Controls.Add(this.PackageInf);
             this.Controls.Add(this.pa_restqty_label);
+            this.Controls.Add(this.AutoPrint);
             this.Controls.Add(this.pa_makecode);
             this.Controls.Add(this.pa_makecode_label);
-            this.Controls.Add(this.pa_standardqty);
-            this.Controls.Add(this.pa_currentqty_label);
+            this.Controls.Add(this.pa_packageqty);
+            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);
+            this.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.Name = "Make_BigBoxCollection";
             this.Tag = "Make!BigBoxCollection";
             this.Text = "栈板采集";
@@ -552,10 +558,11 @@
 
         private CustomControl.ValueLabel.ValueLabel pa_outboxcode;
         private System.Windows.Forms.Label pa_outboxcode_label;
-        private CustomControl.ValueLabel.ValueLabel pa_standardqty;
-        private System.Windows.Forms.Label pa_currentqty_label;
+        private CustomControl.ValueLabel.ValueLabel pa_packageqty;
+        private System.Windows.Forms.Label pa_totalqty_label;
         private CustomControl.ValueLabel.ValueLabel pa_makecode;
         private System.Windows.Forms.Label pa_makecode_label;
+        private System.Windows.Forms.CheckBox AutoPrint;
         private System.Windows.Forms.Label pa_restqty_label;
         private CustomControl.DataGrid_View.DataGridViewWithSerialNum PackageInf;
         private CustomControl.ValueLabel.ValueLabel pa_custcode;
@@ -581,9 +588,8 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn Column3;
         private System.Windows.Forms.DataGridViewTextBoxColumn Column4;
         private System.Windows.Forms.DataGridViewTextBoxColumn Column5;
-        private CustomControl.ValueLabel.ValueLabel pa_currentqty;
-        private System.Windows.Forms.Label pa_standardqty_label;
+        private CustomControl.ValueLabel.ValueLabel pa_totalqty;
+        private System.Windows.Forms.Label pa_packageqty_label;
         private CustomControl.ButtonUtil.NormalButton Packing;
-        private CustomControl.CustomCheckBox.AutoPrintCheckBox AutoPrint;
     }
 }

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

@@ -165,6 +165,7 @@
             this.LabelDataGridView.Size = new System.Drawing.Size(889, 233);
             this.LabelDataGridView.TabIndex = 188;
             this.LabelDataGridView.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.LabelDataGridView_CellContentClick);
+            this.LabelDataGridView.Sorted += new System.EventHandler(this.LabelDataGridView_Sorted);
             // 
             // Choose
             // 

UAS-MES/FunctionCode/Make/Make_Decompose.cs

@@ -170,11 +170,6 @@ namespace UAS_MES.Make
             }
         }
 
-        private void LabelDataGridView_CellClick(object sender, DataGridViewCellEventArgs e)
-        {
-            
-        }
-
         private void LoadBadcode(object sender, EventArgs e)
         {
             sql.Clear();
@@ -273,6 +268,11 @@ namespace UAS_MES.Make
                 OperateResult.AppendText("没有选择拆解项\n", Color.Red);
             }          
         }
+
+        private void LabelDataGridView_Sorted(object sender, EventArgs e)
+        {
+            LoadBadcode(sender, e);
+        }
     }
 }
     

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