shim 8 years ago
parent
commit
a698787552

+ 80 - 80
UAS-MES/FunctionCode/Make/Make_CustomLabelPrint.Designer.cs

@@ -1,6 +1,6 @@
 namespace UAS_MES.Make
 {
-    partial class Make_CustomLablePrint
+    partial class Make_CustomLabelPrint
     {
         /// <summary>
         /// Required designer variable.
@@ -28,23 +28,23 @@
         /// </summary>
         private void InitializeComponent()
         {
-            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Make_CustomLablePrint));
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Make_CustomLabelPrint));
             this.label1 = new System.Windows.Forms.Label();
             this.label2 = new System.Windows.Forms.Label();
             this.label3 = new System.Windows.Forms.Label();
             this.PrintLabel = new System.Windows.Forms.ComboBox();
             this.label4 = new System.Windows.Forms.Label();
             this.label5 = new System.Windows.Forms.Label();
-            this.Printer = new UAS_MES.CustomControl.ComBoxWithFocus.PrinterCombox();
-            this.OperateResult = new UAS_MES.CustomControl.RichText.RichTextAutoBottom();
             this.sncode_label = new System.Windows.Forms.Label();
-            this.inputText = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.label6 = new System.Windows.Forms.Label();
-            this.pr_code = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
-            this.printButton = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
             this.pr_detail = new System.Windows.Forms.Label();
             this.pr_spec = new System.Windows.Forms.Label();
             this.printNum = new UAS_MES.CustomControl.TextBoxWithIcon.NumOnlyTextBox();
+            this.printButton = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
+            this.pr_code = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.inputText = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.OperateResult = new UAS_MES.CustomControl.RichText.RichTextAutoBottom();
+            this.Printer = new UAS_MES.CustomControl.ComBoxWithFocus.PrinterCombox();
             this.SuspendLayout();
             // 
             // label1
@@ -110,24 +110,6 @@
             this.label5.TabIndex = 183;
             this.label5.Text = "标签";
             // 
-            // Printer
-            // 
-            this.Printer.Location = new System.Drawing.Point(916, 37);
-            this.Printer.Margin = new System.Windows.Forms.Padding(6);
-            this.Printer.Name = "Printer";
-            this.Printer.Size = new System.Drawing.Size(190, 37);
-            this.Printer.TabIndex = 182;
-            // 
-            // 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(49, 162);
-            this.OperateResult.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
-            this.OperateResult.Name = "OperateResult";
-            this.OperateResult.Size = new System.Drawing.Size(1057, 354);
-            this.OperateResult.TabIndex = 186;
-            this.OperateResult.Text = "";
-            // 
             // sncode_label
             // 
             this.sncode_label.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
@@ -141,25 +123,6 @@
             this.sncode_label.TabIndex = 188;
             this.sncode_label.Text = "输入框";
             // 
-            // inputText
-            // 
-            this.inputText.AllPower = "ifall";
-            this.inputText.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left)));
-            this.inputText.BackColor = System.Drawing.Color.White;
-            this.inputText.ID = null;
-            this.inputText.Location = new System.Drawing.Point(167, 553);
-            this.inputText.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
-            this.inputText.Name = "inputText";
-            this.inputText.Power = null;
-            this.inputText.Size = new System.Drawing.Size(292, 28);
-            this.inputText.Str = null;
-            this.inputText.Str1 = null;
-            this.inputText.Str2 = null;
-            this.inputText.TabIndex = 187;
-            this.inputText.Tag = "ifwrite";
-            this.inputText.KeyDown += new System.Windows.Forms.KeyEventHandler(this.inputText_KeyDown);
-            // 
             // label6
             // 
             this.label6.AutoSize = true;
@@ -170,39 +133,6 @@
             this.label6.TabIndex = 189;
             this.label6.Text = "份数";
             // 
-            // pr_code
-            // 
-            this.pr_code.AllPower = null;
-            this.pr_code.BackColor = System.Drawing.Color.White;
-            this.pr_code.Font = new System.Drawing.Font("宋体", 9F);
-            this.pr_code.ID = null;
-            this.pr_code.Location = new System.Drawing.Point(180, 40);
-            this.pr_code.Name = "pr_code";
-            this.pr_code.Power = null;
-            this.pr_code.Size = new System.Drawing.Size(252, 28);
-            this.pr_code.Str = null;
-            this.pr_code.Str1 = null;
-            this.pr_code.Str2 = null;
-            this.pr_code.TabIndex = 191;
-            this.pr_code.KeyDown += new System.Windows.Forms.KeyEventHandler(this.pr_code_KeyDown);
-            // 
-            // printButton
-            // 
-            this.printButton.AllPower = null;
-            this.printButton.BackColor = System.Drawing.Color.Transparent;
-            this.printButton.DownImage = ((System.Drawing.Image)(resources.GetObject("printButton.DownImage")));
-            this.printButton.Image = null;
-            this.printButton.IsShowBorder = true;
-            this.printButton.Location = new System.Drawing.Point(957, 551);
-            this.printButton.MoveImage = ((System.Drawing.Image)(resources.GetObject("printButton.MoveImage")));
-            this.printButton.Name = "printButton";
-            this.printButton.NormalImage = ((System.Drawing.Image)(resources.GetObject("printButton.NormalImage")));
-            this.printButton.Power = null;
-            this.printButton.Size = new System.Drawing.Size(75, 28);
-            this.printButton.TabIndex = 192;
-            this.printButton.Text = "打印";
-            this.printButton.UseVisualStyleBackColor = false;
-            // 
             // pr_detail
             // 
             this.pr_detail.AutoSize = true;
@@ -237,7 +167,77 @@
             this.printNum.TabIndex = 195;
             this.printNum.Text = "1";
             // 
-            // Make_CustomLablePrint
+            // printButton
+            // 
+            this.printButton.AllPower = null;
+            this.printButton.BackColor = System.Drawing.Color.Transparent;
+            this.printButton.DownImage = ((System.Drawing.Image)(resources.GetObject("printButton.DownImage")));
+            this.printButton.Image = null;
+            this.printButton.IsShowBorder = true;
+            this.printButton.Location = new System.Drawing.Point(957, 551);
+            this.printButton.MoveImage = ((System.Drawing.Image)(resources.GetObject("printButton.MoveImage")));
+            this.printButton.Name = "printButton";
+            this.printButton.NormalImage = ((System.Drawing.Image)(resources.GetObject("printButton.NormalImage")));
+            this.printButton.Power = null;
+            this.printButton.Size = new System.Drawing.Size(75, 28);
+            this.printButton.TabIndex = 192;
+            this.printButton.Text = "打印";
+            this.printButton.UseVisualStyleBackColor = false;
+            // 
+            // pr_code
+            // 
+            this.pr_code.AllPower = null;
+            this.pr_code.BackColor = System.Drawing.Color.White;
+            this.pr_code.Font = new System.Drawing.Font("宋体", 9F);
+            this.pr_code.ID = null;
+            this.pr_code.Location = new System.Drawing.Point(180, 40);
+            this.pr_code.Name = "pr_code";
+            this.pr_code.Power = null;
+            this.pr_code.Size = new System.Drawing.Size(252, 28);
+            this.pr_code.Str = null;
+            this.pr_code.Str1 = null;
+            this.pr_code.Str2 = null;
+            this.pr_code.TabIndex = 191;
+            this.pr_code.KeyDown += new System.Windows.Forms.KeyEventHandler(this.pr_code_KeyDown);
+            // 
+            // inputText
+            // 
+            this.inputText.AllPower = "ifall";
+            this.inputText.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left)));
+            this.inputText.BackColor = System.Drawing.Color.White;
+            this.inputText.ID = null;
+            this.inputText.Location = new System.Drawing.Point(167, 553);
+            this.inputText.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.inputText.Name = "inputText";
+            this.inputText.Power = null;
+            this.inputText.Size = new System.Drawing.Size(292, 28);
+            this.inputText.Str = null;
+            this.inputText.Str1 = null;
+            this.inputText.Str2 = null;
+            this.inputText.TabIndex = 187;
+            this.inputText.Tag = "ifwrite";
+            this.inputText.KeyDown += new System.Windows.Forms.KeyEventHandler(this.inputText_KeyDown);
+            // 
+            // 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(49, 162);
+            this.OperateResult.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.OperateResult.Name = "OperateResult";
+            this.OperateResult.Size = new System.Drawing.Size(1057, 354);
+            this.OperateResult.TabIndex = 186;
+            this.OperateResult.Text = "";
+            // 
+            // Printer
+            // 
+            this.Printer.Location = new System.Drawing.Point(916, 37);
+            this.Printer.Margin = new System.Windows.Forms.Padding(6);
+            this.Printer.Name = "Printer";
+            this.Printer.Size = new System.Drawing.Size(190, 37);
+            this.Printer.TabIndex = 182;
+            // 
+            // Make_CustomLabelPrint
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
@@ -259,9 +259,9 @@
             this.Controls.Add(this.label2);
             this.Controls.Add(this.label1);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
-            this.Name = "Make_CustomLablePrint";
+            this.Name = "Make_CustomLabelPrint";
             this.Tag = "Make!CustomLabelPrint";
-            this.Text = "Make_CustomLablePrint";
+            this.Text = "Make_CustomLabelPrint";
             this.Load += new System.EventHandler(this.Make_CustomLablePrint_Load);
             this.ResumeLayout(false);
             this.PerformLayout();

+ 2 - 2
UAS-MES/FunctionCode/Make/Make_CustomLabelPrint.cs

@@ -16,7 +16,7 @@ using UAS_MES.PublicMethod;
 
 namespace UAS_MES.Make
 {
-    public partial class Make_CustomLablePrint : Form
+    public partial class Make_CustomLabelPrint : Form
     {
         DataHelper dh;
 
@@ -45,7 +45,7 @@ namespace UAS_MES.Make
         System.DateTime[] indate;
 
         StringBuilder sb = new StringBuilder();
-        public Make_CustomLablePrint()
+        public Make_CustomLabelPrint()
         {
             InitializeComponent();
         }

+ 15 - 0
UAS-MES/UAS-MES.csproj

@@ -229,6 +229,12 @@
     <Compile Include="CustomControl\CustomCheckBox\AutoPrintCheckBox.Designer.cs">
       <DependentUpon>AutoPrintCheckBox.cs</DependentUpon>
     </Compile>
+    <Compile Include="CustomControl\CustomCheckBox\CustomCheckBox.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="CustomControl\CustomCheckBox\CustomCheckBox.Designer.cs">
+      <DependentUpon>CustomCheckBox.cs</DependentUpon>
+    </Compile>
     <Compile Include="CustomControl\CustomCheckBox\LockCheckBox.cs">
       <SubType>Component</SubType>
     </Compile>
@@ -453,6 +459,12 @@
     <Compile Include="FunctionCode\Make\Make_ColorBoxLabelPrint.Designer.cs">
       <DependentUpon>Make_ColorBoxLabelPrint.cs</DependentUpon>
     </Compile>
+    <Compile Include="FunctionCode\Make\Make_CustomLabelPrint.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="FunctionCode\Make\Make_CustomLabelPrint.Designer.cs">
+      <DependentUpon>Make_CustomLabelPrint.cs</DependentUpon>
+    </Compile>
     <Compile Include="FunctionCode\Make\Make_Decompose.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -964,6 +976,9 @@
     <EmbeddedResource Include="FunctionCode\Make\Make_ColorBoxLabelPrint.resx">
       <DependentUpon>Make_ColorBoxLabelPrint.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="FunctionCode\Make\Make_CustomLabelPrint.resx">
+      <DependentUpon>Make_CustomLabelPrint.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="FunctionCode\Make\Make_Decompose.resx">
       <DependentUpon>Make_Decompose.cs</DependentUpon>
     </EmbeddedResource>