打印需要密码

UAS-出货标签管理(泽天)/ComInfoSet.Designer.cs

@@ -100,7 +100,7 @@
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
             this.Text = "ComInfoSet";
             this.Load += new System.EventHandler(this.ComInfoSet_Load);
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
             this.PerformLayout();
 
         }

UAS-出货标签管理(泽天)/CustomControl/BlurSearch.Designer.cs

@@ -73,7 +73,7 @@
             this.Size = new System.Drawing.Size(154, 120);
             this.Load += new System.EventHandler(this.BlurSearch_Load);
             this.Leave += new System.EventHandler(this.BlurSearch_Leave);
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
             this.PerformLayout();
 
         }

UAS-出货标签管理(泽天)/CustomControl/DataGridViewWithSerialNum.Designer.cs

@@ -40,7 +40,7 @@ namespace UAS_LabelMachine.CustomControl
             this.RowTemplate.Height = 23;
             this.CellPainting += new System.Windows.Forms.DataGridViewCellPaintingEventHandler(this.DataGridViewWithSerialNum_CellPainting);
             ((System.ComponentModel.ISupportInitialize)(this)).EndInit();
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
         }
         #endregion
     }

UAS-出货标签管理(泽天)/CustomControl/EnterTextBox.Designer.cs

@@ -35,7 +35,7 @@
             this.Size = new System.Drawing.Size(196, 21);
             this.Enter += new System.EventHandler(this.EnterTextBox_Enter);
             this.Leave += new System.EventHandler(this.EnterTextBox_Leave);
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
 
         }
 

UAS-出货标签管理(泽天)/CustomControl/HeadBar.Designer.cs

@@ -61,7 +61,7 @@
             this.Name = "HeadBar";
             ((System.ComponentModel.ISupportInitialize)(this.MinWindow)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.CloseWindow)).EndInit();
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
 
         }
 

UAS-出货标签管理(泽天)/CustomControl/NumOnlyTextBox.Designer.cs

@@ -35,7 +35,7 @@
             this.Enter += new System.EventHandler(this.NumOnlyTextBox_Enter);
             this.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.NumOnlyTextBox_KeyPress);
             this.Leave += new System.EventHandler(this.NumOnlyTextBox_Leave);
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
 
         }
 

UAS-出货标签管理(泽天)/CustomControl/Pagination.Designer.cs

@@ -233,7 +233,7 @@ namespace UAS_LabelMachine.CustomControl
             this.Cursor = System.Windows.Forms.Cursors.Hand;
             this.Name = "Pagination";
             this.Size = new System.Drawing.Size(543, 32);
-            this.panel1.ResumeLayout(false);
+            this.panel1.ResumeLayout(true);
             this.panel1.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)(this.UpLoadData)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.DownLoadTemplet)).EndInit();
@@ -243,7 +243,7 @@ namespace UAS_LabelMachine.CustomControl
             ((System.ComponentModel.ISupportInitialize)(this.LastPage)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.NextPage)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.FirstPage)).EndInit();
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
 
         }
 

UAS-出货标签管理(泽天)/CustomControl/PrinterCombox.Designer.cs

@@ -51,7 +51,7 @@
             this.Name = "PrinterCombox";
             this.Size = new System.Drawing.Size(189, 19);
             this.Load += new System.EventHandler(this.PrinterCombox_Load);
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
 
         }
 

UAS-出货标签管理(泽天)/CustomControl/SearchTextBox.Designer.cs

@@ -64,7 +64,7 @@
             this.Name = "SearchTextBox";
             this.Size = new System.Drawing.Size(247, 21);
             ((System.ComponentModel.ISupportInitialize)(this.Search_Icon)).EndInit();
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
             this.PerformLayout();
 
         }

UAS-出货标签管理(泽天)/CustomControl/SerialPortCombox.Designer.cs

@@ -49,7 +49,7 @@
             this.Name = "SerialPortCombox";
             this.Size = new System.Drawing.Size(186, 25);
             this.Load += new System.EventHandler(this.SerialPortCombox_Load);
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
 
         }
 

UAS-出货标签管理(泽天)/DbFind.Designer.cs

@@ -72,7 +72,7 @@
             this.Load += new System.EventHandler(this.DbFind_Load);
             this.SizeChanged += new System.EventHandler(this.DbFind_SizeChanged);
             ((System.ComponentModel.ISupportInitialize)(this.DbFindGridView)).EndInit();
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
 
         }
 

UAS-出货标签管理(泽天)/Login.Designer.cs

@@ -186,7 +186,7 @@
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.LoginIcon)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.ComData)).EndInit();
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
             this.PerformLayout();
 
         }

UAS-出货标签管理(泽天)/MachineSetting.Designer.cs

@@ -206,7 +206,7 @@
             this.Name = "MachineSetting";
             this.Text = "贴标机参数设置";
             this.Load += new System.EventHandler(this.MachineSetting_Load);
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
             this.PerformLayout();
 
         }

UAS-出货标签管理(泽天)/PassWordConfirm.Designer.cs

@@ -0,0 +1,94 @@
+namespace UAS_LabelMachine
+{
+    partial class PassWordConfirm
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.label1 = new System.Windows.Forms.Label();
+            this.PassWord = new UAS_LabelMachine.CustomControl.EnterTextBox();
+            this.Confirm = new System.Windows.Forms.Button();
+            this.SuspendLayout();
+            // 
+            // label1
+            // 
+            this.label1.AutoSize = true;
+            this.label1.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label1.Location = new System.Drawing.Point(132, 106);
+            this.label1.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+            this.label1.Name = "label1";
+            this.label1.Size = new System.Drawing.Size(71, 36);
+            this.label1.TabIndex = 108;
+            this.label1.Text = "密码";
+            // 
+            // PassWord
+            // 
+            this.PassWord.ID = null;
+            this.PassWord.Location = new System.Drawing.Point(228, 106);
+            this.PassWord.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
+            this.PassWord.Name = "PassWord";
+            this.PassWord.PasswordChar = '*';
+            this.PassWord.Size = new System.Drawing.Size(286, 35);
+            this.PassWord.Str = null;
+            this.PassWord.Str1 = null;
+            this.PassWord.Str2 = null;
+            this.PassWord.TabIndex = 109;
+            // 
+            // Confirm
+            // 
+            this.Confirm.Location = new System.Drawing.Point(276, 188);
+            this.Confirm.Margin = new System.Windows.Forms.Padding(6);
+            this.Confirm.Name = "Confirm";
+            this.Confirm.Size = new System.Drawing.Size(150, 46);
+            this.Confirm.TabIndex = 111;
+            this.Confirm.Text = "确认";
+            this.Confirm.UseVisualStyleBackColor = true;
+            this.Confirm.Click += new System.EventHandler(this.Confirm_Click);
+            // 
+            // PassWordConfirm
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 24F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(696, 306);
+            this.Controls.Add(this.Confirm);
+            this.Controls.Add(this.PassWord);
+            this.Controls.Add(this.label1);
+            this.Margin = new System.Windows.Forms.Padding(6);
+            this.Name = "PassWordConfirm";
+            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
+            this.Text = "密码确认";
+            this.Load += new System.EventHandler(this.ComInfoSet_Load);
+            this.ResumeLayout(true);
+            this.PerformLayout();
+
+        }
+
+        #endregion
+        private System.Windows.Forms.Label label1;
+        private CustomControl.EnterTextBox PassWord;
+        private System.Windows.Forms.Button Confirm;
+    }
+}

UAS-出货标签管理(泽天)/PassWordConfirm.cs

@@ -0,0 +1,29 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Windows.Forms;
+
+namespace UAS_LabelMachine
+{
+    public partial class PassWordConfirm : Form
+    {
+        public PassWordConfirm()
+        {
+            InitializeComponent();
+        }
+
+        private void ComInfoSet_Load(object sender, EventArgs e)
+        {
+            PassWord.Text = Properties.Settings.Default.BaudRate;
+        }
+
+        private void Confirm_Click(object sender, EventArgs e)
+        {
+            Close();
+        }
+    }
+}

UAS-出货标签管理(泽天)/PassWordConfirm.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-出货标签管理(泽天)/PowerSetting.Designer.cs

@@ -253,7 +253,7 @@
             this.Text = "权限设置";
             this.Load += new System.EventHandler(this.PowerSetting_Load);
             ((System.ComponentModel.ISupportInitialize)(this.PowerSetDGV)).EndInit();
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
             this.PerformLayout();
 
         }

UAS-出货标签管理(泽天)/SetLoadingWindow.Designer.cs

@@ -74,7 +74,7 @@
             this.Text = "SetLoadingWindow";
             this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.SetLoadingWindow_FormClosing);
             this.Load += new System.EventHandler(this.SetLoadingWindow_Load);
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
 
         }
 

UAS-出货标签管理(泽天)/UAS-出货标签管理(泽天).csproj

@@ -146,6 +146,12 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="PassWordConfirm.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="PassWordConfirm.Designer.cs">
+      <DependentUpon>PassWordConfirm.cs</DependentUpon>
+    </Compile>
     <Compile Include="ComInfoSet.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -341,6 +347,9 @@
     <Compile Include="附件内容打印.Designer.cs">
       <DependentUpon>附件内容打印.cs</DependentUpon>
     </Compile>
+    <EmbeddedResource Include="PassWordConfirm.resx">
+      <DependentUpon>PassWordConfirm.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="ComInfoSet.resx">
       <DependentUpon>ComInfoSet.cs</DependentUpon>
     </EmbeddedResource>

UAS-出货标签管理(泽天)/UAS_出货标签管理.Designer.cs

@@ -1283,7 +1283,7 @@
             // 
             this.label15.AutoSize = true;
             this.label15.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label15.Location = new System.Drawing.Point(46, 53);
+            this.label15.Location = new System.Drawing.Point(11, 34);
             this.label15.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label15.Name = "label15";
             this.label15.Size = new System.Drawing.Size(62, 31);
@@ -1353,7 +1353,7 @@
             this.Weight.AutoSize = true;
             this.Weight.Font = new System.Drawing.Font("微软雅黑", 25F);
             this.Weight.ForeColor = System.Drawing.Color.Red;
-            this.Weight.Location = new System.Drawing.Point(66, 119);
+            this.Weight.Location = new System.Drawing.Point(69, 122);
             this.Weight.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.Weight.Name = "Weight";
             this.Weight.Size = new System.Drawing.Size(0, 88);
@@ -1617,7 +1617,7 @@
             // 
             this.label17.AutoSize = true;
             this.label17.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label17.Location = new System.Drawing.Point(31, 284);
+            this.label17.Location = new System.Drawing.Point(34, 287);
             this.label17.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label17.Name = "label17";
             this.label17.Size = new System.Drawing.Size(110, 31);
@@ -1653,7 +1653,7 @@
             // 
             this.label18.AutoSize = true;
             this.label18.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label18.Location = new System.Drawing.Point(136, 182);
+            this.label18.Location = new System.Drawing.Point(139, 185);
             this.label18.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label18.Name = "label18";
             this.label18.Size = new System.Drawing.Size(24, 31);
@@ -1688,7 +1688,7 @@
             // 
             this.label16.AutoSize = true;
             this.label16.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label16.Location = new System.Drawing.Point(137, 90);
+            this.label16.Location = new System.Drawing.Point(140, 93);
             this.label16.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label16.Name = "label16";
             this.label16.Size = new System.Drawing.Size(24, 31);
@@ -1723,7 +1723,7 @@
             // 
             this.label12.AutoSize = true;
             this.label12.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label12.Location = new System.Drawing.Point(31, 137);
+            this.label12.Location = new System.Drawing.Point(34, 140);
             this.label12.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label12.Name = "label12";
             this.label12.Size = new System.Drawing.Size(110, 31);
@@ -1734,7 +1734,7 @@
             // 
             this.label7.AutoSize = true;
             this.label7.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label7.Location = new System.Drawing.Point(31, 42);
+            this.label7.Location = new System.Drawing.Point(34, 45);
             this.label7.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label7.Name = "label7";
             this.label7.Size = new System.Drawing.Size(110, 31);
@@ -1745,7 +1745,7 @@
             // 
             this.SingleLabelPrint.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
             this.SingleLabelPrint.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.SingleLabelPrint.Location = new System.Drawing.Point(14, 356);
+            this.SingleLabelPrint.Location = new System.Drawing.Point(38, 357);
             this.SingleLabelPrint.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
             this.SingleLabelPrint.Name = "SingleLabelPrint";
             this.SingleLabelPrint.Size = new System.Drawing.Size(136, 52);
@@ -2186,7 +2186,7 @@
             // 
             this.label14.AutoSize = true;
             this.label14.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label14.Location = new System.Drawing.Point(50, 293);
+            this.label14.Location = new System.Drawing.Point(53, 296);
             this.label14.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label14.Name = "label14";
             this.label14.Size = new System.Drawing.Size(155, 36);
@@ -2206,7 +2206,7 @@
             // 
             this.label13.AutoSize = true;
             this.label13.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label13.Location = new System.Drawing.Point(50, 247);
+            this.label13.Location = new System.Drawing.Point(53, 250);
             this.label13.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label13.Name = "label13";
             this.label13.Size = new System.Drawing.Size(155, 36);
@@ -2236,7 +2236,7 @@
             // 
             this.SingleLabelAutoPrint.AutoSize = true;
             this.SingleLabelAutoPrint.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.SingleLabelAutoPrint.Location = new System.Drawing.Point(29, 196);
+            this.SingleLabelAutoPrint.Location = new System.Drawing.Point(32, 199);
             this.SingleLabelAutoPrint.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
             this.SingleLabelAutoPrint.Name = "SingleLabelAutoPrint";
             this.SingleLabelAutoPrint.Size = new System.Drawing.Size(142, 35);
@@ -2282,7 +2282,7 @@
             // 
             this.AutoPrintMidBox.AutoSize = true;
             this.AutoPrintMidBox.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.AutoPrintMidBox.Location = new System.Drawing.Point(34, 390);
+            this.AutoPrintMidBox.Location = new System.Drawing.Point(16, 368);
             this.AutoPrintMidBox.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
             this.AutoPrintMidBox.Name = "AutoPrintMidBox";
             this.AutoPrintMidBox.Size = new System.Drawing.Size(166, 35);
@@ -2294,7 +2294,7 @@
             // 
             this.CurrentRowOnly.AutoSize = true;
             this.CurrentRowOnly.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.CurrentRowOnly.Location = new System.Drawing.Point(182, 205);
+            this.CurrentRowOnly.Location = new System.Drawing.Point(185, 208);
             this.CurrentRowOnly.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
             this.CurrentRowOnly.Name = "CurrentRowOnly";
             this.CurrentRowOnly.Size = new System.Drawing.Size(166, 35);
@@ -2325,7 +2325,7 @@
             // 
             this.label2.AutoSize = true;
             this.label2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label2.Location = new System.Drawing.Point(28, 247);
+            this.label2.Location = new System.Drawing.Point(31, 250);
             this.label2.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label2.Name = "label2";
             this.label2.Size = new System.Drawing.Size(62, 31);
@@ -2349,7 +2349,7 @@
             // 
             this.label5.AutoSize = true;
             this.label5.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label5.Location = new System.Drawing.Point(28, 312);
+            this.label5.Location = new System.Drawing.Point(31, 315);
             this.label5.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label5.Name = "label5";
             this.label5.Size = new System.Drawing.Size(62, 31);
@@ -2381,7 +2381,7 @@
             // 
             this.MidLabelAutoPrint.AutoSize = true;
             this.MidLabelAutoPrint.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.MidLabelAutoPrint.Location = new System.Drawing.Point(30, 205);
+            this.MidLabelAutoPrint.Location = new System.Drawing.Point(33, 208);
             this.MidLabelAutoPrint.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
             this.MidLabelAutoPrint.Name = "MidLabelAutoPrint";
             this.MidLabelAutoPrint.Size = new System.Drawing.Size(142, 35);
@@ -2435,7 +2435,7 @@
             // 
             this.AutoPrintOutBox.AutoSize = true;
             this.AutoPrintOutBox.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.AutoPrintOutBox.Location = new System.Drawing.Point(148, 178);
+            this.AutoPrintOutBox.Location = new System.Drawing.Point(151, 181);
             this.AutoPrintOutBox.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
             this.AutoPrintOutBox.Name = "AutoPrintOutBox";
             this.AutoPrintOutBox.Size = new System.Drawing.Size(118, 35);
@@ -2447,7 +2447,7 @@
             // 
             this.AutoSetOutBox.AutoSize = true;
             this.AutoSetOutBox.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.AutoSetOutBox.Location = new System.Drawing.Point(19, 220);
+            this.AutoSetOutBox.Location = new System.Drawing.Point(22, 223);
             this.AutoSetOutBox.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
             this.AutoSetOutBox.Name = "AutoSetOutBox";
             this.AutoSetOutBox.Size = new System.Drawing.Size(142, 35);
@@ -2459,7 +2459,7 @@
             // 
             this.DiffDetno.AutoSize = true;
             this.DiffDetno.Font = new System.Drawing.Font("微软雅黑", 8F);
-            this.DiffDetno.Location = new System.Drawing.Point(261, 372);
+            this.DiffDetno.Location = new System.Drawing.Point(264, 375);
             this.DiffDetno.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
             this.DiffDetno.Name = "DiffDetno";
             this.DiffDetno.Size = new System.Drawing.Size(133, 34);
@@ -2471,7 +2471,7 @@
             // 
             this.DiffCPN.AutoSize = true;
             this.DiffCPN.Font = new System.Drawing.Font("微软雅黑", 8F);
-            this.DiffCPN.Location = new System.Drawing.Point(261, 328);
+            this.DiffCPN.Location = new System.Drawing.Point(264, 331);
             this.DiffCPN.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
             this.DiffCPN.Name = "DiffCPN";
             this.DiffCPN.Size = new System.Drawing.Size(135, 34);
@@ -2483,7 +2483,7 @@
             // 
             this.BoxCount.AutoSize = true;
             this.BoxCount.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.BoxCount.Location = new System.Drawing.Point(314, 426);
+            this.BoxCount.Location = new System.Drawing.Point(317, 429);
             this.BoxCount.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.BoxCount.Name = "BoxCount";
             this.BoxCount.Size = new System.Drawing.Size(0, 31);
@@ -2493,7 +2493,7 @@
             // 
             this.DiffLotNo.AutoSize = true;
             this.DiffLotNo.Font = new System.Drawing.Font("微软雅黑", 8F);
-            this.DiffLotNo.Location = new System.Drawing.Point(261, 280);
+            this.DiffLotNo.Location = new System.Drawing.Point(264, 283);
             this.DiffLotNo.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
             this.DiffLotNo.Name = "DiffLotNo";
             this.DiffLotNo.Size = new System.Drawing.Size(118, 34);
@@ -2505,7 +2505,7 @@
             // 
             this.DiffDC.AutoSize = true;
             this.DiffDC.Font = new System.Drawing.Font("微软雅黑", 8F);
-            this.DiffDC.Location = new System.Drawing.Point(261, 228);
+            this.DiffDC.Location = new System.Drawing.Point(264, 231);
             this.DiffDC.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
             this.DiffDC.Name = "DiffDC";
             this.DiffDC.Size = new System.Drawing.Size(121, 34);
@@ -2517,7 +2517,7 @@
             // 
             this.OnlyOneRow.AutoSize = true;
             this.OnlyOneRow.Font = new System.Drawing.Font("微软雅黑", 8F);
-            this.OnlyOneRow.Location = new System.Drawing.Point(261, 180);
+            this.OnlyOneRow.Location = new System.Drawing.Point(264, 183);
             this.OnlyOneRow.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
             this.OnlyOneRow.Name = "OnlyOneRow";
             this.OnlyOneRow.Size = new System.Drawing.Size(111, 34);
@@ -2529,7 +2529,7 @@
             // 
             this.AllLabel.AutoSize = true;
             this.AllLabel.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.AllLabel.Location = new System.Drawing.Point(19, 178);
+            this.AllLabel.Location = new System.Drawing.Point(22, 181);
             this.AllLabel.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
             this.AllLabel.Name = "AllLabel";
             this.AllLabel.Size = new System.Drawing.Size(142, 35);
@@ -2552,7 +2552,7 @@
             // LogingOut
             // 
             this.LogingOut.AutoSize = true;
-            this.LogingOut.Location = new System.Drawing.Point(278, 37);
+            this.LogingOut.Location = new System.Drawing.Point(281, 40);
             this.LogingOut.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.LogingOut.Name = "LogingOut";
             this.LogingOut.Size = new System.Drawing.Size(82, 41);
@@ -2580,7 +2580,7 @@
             // 
             this.label10.AutoSize = true;
             this.label10.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label10.Location = new System.Drawing.Point(59, 320);
+            this.label10.Location = new System.Drawing.Point(62, 323);
             this.label10.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label10.Name = "label10";
             this.label10.Size = new System.Drawing.Size(62, 31);
@@ -2591,7 +2591,7 @@
             // 
             this.label6.AutoSize = true;
             this.label6.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label6.Location = new System.Drawing.Point(59, 273);
+            this.label6.Location = new System.Drawing.Point(62, 276);
             this.label6.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label6.Name = "label6";
             this.label6.Size = new System.Drawing.Size(62, 31);

UAS-出货标签管理(泽天)/UAS_出货标签管理.cs

@@ -110,6 +110,8 @@ namespace UAS_LabelMachine
         string X = "";
 
         string Y = "";
+
+        bool CheckPassWord = true;
         //贴标机采集的行数
         int MachineCollectRowIndex = 0;
 
@@ -743,7 +745,9 @@ namespace UAS_LabelMachine
             {
                 if (BoxNum + CodeCount >= OutboxCapacity.Value)
                 {
+                    CheckPassWord = false;
                     OutBoxLabelPrint.PerformClick();
+                    CheckPassWord = true;
                 }
             }
             GridPrcode.Refresh();
@@ -756,7 +760,6 @@ namespace UAS_LabelMachine
                 {
                     RemainTxt();
                 }
-
         }
 
         private void AutoPrintSingleLabel()
@@ -1078,6 +1081,11 @@ namespace UAS_LabelMachine
 
         private void SingleLabelPrint_Click(object sender, EventArgs e)
         {
+            if (PassCheck() != dh.getFieldDataByCondition("configs", "data", "code='PassWord' and caller='BarCodeSetting'").ToString())
+            {
+                MessageBox.Show("密码不正确，不允许操作");
+                return;
+            }
             if (SingleLabelCombox.Text != "")
             {
                 if (SingleBoxBegin.Text != "" || SingleBoxEnd.Text != "")
@@ -1512,8 +1520,21 @@ namespace UAS_LabelMachine
             }
         }
 
+        private string PassCheck()
+        {
+            PassWordConfirm form = new PassWordConfirm();
+            form.StartPosition = FormStartPosition.CenterScreen;
+            form.ShowDialog();
+            return form.Controls["PassWord"].Text;
+        }
+
         private void CleanDetail_Click(object sender, EventArgs e)
         {
+            if (PassCheck() != dh.getFieldDataByCondition("configs", "data", "code='PassWord' and caller='BarCodeSetting'").ToString())
+            {
+                MessageBox.Show("密码不正确，不允许操作");
+                return;
+            }
             if (dh.getFieldDataByCondition("prodinout", "pi_statuscode", "pi_inoutno='" + pi_inoutno.Text + "'").ToString() == "POSTED")
             {
                 MessageBox.Show("单据" + pi_inoutno.Text + "已过账，不允许删除条码");
@@ -1563,6 +1584,11 @@ namespace UAS_LabelMachine
 
         private void OutBoxLabelPrint_Click(object sender, EventArgs e)
         {
+            if (CheckPassWord && PassCheck() != dh.getFieldDataByCondition("configs", "data", "code='PassWord' and caller='BarCodeSetting'").ToString())
+            {
+                MessageBox.Show("密码不正确，不允许操作");
+                return;
+            }
             if (OutBoxCombox.Text != "")
             {
                 Pack_Click(sender, e);
@@ -1850,7 +1876,7 @@ namespace UAS_LabelMachine
                             string FWhCode = GridPrcode.Rows[i + 1].Cells["pd_whcode"].Value.ToString();
                             string FPoCode = GridPrcode.Rows[i + 1].Cells["pd_pocode1"].Value.ToString();
                             string FRemark = GridPrcode.Rows[i + 1].Cells["pd_remark1"].Value.ToString();
-                            if (BProdCode == FProdCode && BPrBrand == FrBrand && BCustProdCode == FCustProdCode && (CombindetailTwo.Checked && FPoCode == BPoCode || Combindetail.Checked || CombindetailThree.Checked && FRemark == BRemark))
+                            if (BProdCode == FProdCode && BPrBrand == FrBrand && BCustProdCode == FCustProdCode && (CombindetailTwo.Checked && FPoCode == BPoCode || Combindetail.Checked || CombindetailThree.Checked && FRemark == BRemark && FPoCode == BPoCode))
                             {
                                 GridPrcode.Rows[CurrentIndex].Cells["pd_outqty"].Value = double.Parse(GridPrcode.Rows[CurrentIndex].Cells["pd_outqty"].Value.ToString()) + double.Parse(GridPrcode.Rows[i + 1].Cells["pd_outqty"].Value.ToString());
                                 GridPrcode.Rows[CurrentIndex].Cells["CollectedNum"].Value = double.Parse(GridPrcode.Rows[CurrentIndex].Cells["CollectedNum"].Value.ToString()) + double.Parse(GridPrcode.Rows[i + 1].Cells["CollectedNum"].Value.ToString());

UAS-出货标签管理(泽天)/内部标签打印.Designer.cs

@@ -102,7 +102,7 @@
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
             this.Text = "附加内容打印";
             this.Load += new System.EventHandler(this.附件内容打印_Load);
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
             this.PerformLayout();
 
         }

UAS-出货标签管理(泽天)/客户标签维护.Designer.cs

@@ -651,7 +651,7 @@ namespace UAS_LabelMachine
             this.SizeChanged += new System.EventHandler(this.产品标签维护_SizeChanged);
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.LabelDataGridView)).EndInit();
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
             this.PerformLayout();
 
         }

UAS-出货标签管理(泽天)/生成条码.Designer.cs

@@ -376,7 +376,7 @@
             this.Load += new System.EventHandler(this.生成条码_Load);
             this.SizeChanged += new System.EventHandler(this.生成条码_SizeChanged);
             ((System.ComponentModel.ISupportInitialize)(this.ProdIoInfDGV)).EndInit();
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
             this.PerformLayout();
 
         }

UAS-出货标签管理(泽天)/贴标角度设置.Designer.cs

@@ -225,7 +225,7 @@
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
             this.Text = "附加内容打印";
             this.Load += new System.EventHandler(this.附件内容打印_Load);
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
             this.PerformLayout();
 
         }

UAS-出货标签管理(泽天)/采集策略.Designer.cs

@@ -1566,7 +1566,7 @@
             this.Text = "采集策略";
             this.Load += new System.EventHandler(this.采集策略_Load);
             this.SizeChanged += new System.EventHandler(this.采集策略_SizeChanged);
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
             this.PerformLayout();
 
         }

UAS-出货标签管理(泽天)/附件内容打印.Designer.cs

@@ -336,7 +336,7 @@
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
             this.Text = "附加内容打印";
             this.Load += new System.EventHandler(this.附件内容打印_Load);
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
             this.PerformLayout();
 
         }