泽天箱容量优化，欧度立方MES数据地址修改

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

@@ -28,50 +28,53 @@
         /// </summary>
         private void InitializeComponent()
         {
-            this.TextBox = new System.Windows.Forms.TextBox();
             this.Search_Icon = new System.Windows.Forms.PictureBox();
+            this.TextBox = new System.Windows.Forms.TextBox();
             ((System.ComponentModel.ISupportInitialize)(this.Search_Icon)).BeginInit();
             this.SuspendLayout();
             // 
-            // TextBox
-            // 
-            this.TextBox.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.TextBox.Location = new System.Drawing.Point(0, 0);
-            this.TextBox.Name = "TextBox";
-            this.TextBox.Size = new System.Drawing.Size(247, 21);
-            this.TextBox.TabIndex = 0;
-            this.TextBox.TextChanged += new System.EventHandler(this.TextBox_TextChanged);
-            this.TextBox.Enter += new System.EventHandler(this.TextBox_Enter);
-            this.TextBox.Leave += new System.EventHandler(this.TextBox_Leave);
-            // 
             // Search_Icon
             // 
-            this.Search_Icon.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Right)));
             this.Search_Icon.Cursor = System.Windows.Forms.Cursors.Hand;
+            this.Search_Icon.Dock = System.Windows.Forms.DockStyle.Right;
             this.Search_Icon.Image = global::UAS_LabelMachine.Properties.Resources.search_16px_1202802_easyicon_net;
-            this.Search_Icon.Location = new System.Drawing.Point(227, 1);
+            this.Search_Icon.Location = new System.Drawing.Point(183, 0);
             this.Search_Icon.Name = "Search_Icon";
-            this.Search_Icon.Size = new System.Drawing.Size(19, 19);
+            this.Search_Icon.Size = new System.Drawing.Size(21, 21);
             this.Search_Icon.TabIndex = 1;
             this.Search_Icon.TabStop = false;
             this.Search_Icon.Click += new System.EventHandler(this.Search_Icon_Click);
             // 
+            // TextBox
+            // 
+            this.TextBox.BackColor = System.Drawing.Color.White;
+            this.TextBox.Dock = System.Windows.Forms.DockStyle.Left;
+            this.TextBox.Location = new System.Drawing.Point(0, 0);
+            this.TextBox.Name = "TextBox";
+            this.TextBox.Size = new System.Drawing.Size(178, 35);
+            this.TextBox.TabIndex = 0;
+            this.TextBox.TextChanged += new System.EventHandler(this.TextBox_TextChanged);
+            this.TextBox.Enter += new System.EventHandler(this.TextBox_Enter);
+            this.TextBox.KeyDown += new System.Windows.Forms.KeyEventHandler(this.TextBox_KeyDown);
+            this.TextBox.Leave += new System.EventHandler(this.TextBox_Leave);
+            // 
             // SearchTextBox
             // 
             this.Controls.Add(this.Search_Icon);
             this.Controls.Add(this.TextBox);
             this.Name = "SearchTextBox";
-            this.Size = new System.Drawing.Size(247, 21);
+            this.Size = new System.Drawing.Size(204, 21);
+            this.Load += new System.EventHandler(this.SearchTextBox_Load);
+            this.SizeChanged += new System.EventHandler(this.SearchTextBox_SizeChanged);
             ((System.ComponentModel.ISupportInitialize)(this.Search_Icon)).EndInit();
-            this.ResumeLayout(true);
+            this.ResumeLayout(false);
             this.PerformLayout();
 
         }
 
         #endregion
 
-        private System.Windows.Forms.TextBox TextBox;
         private System.Windows.Forms.PictureBox Search_Icon;
+        private System.Windows.Forms.TextBox TextBox;
     }
 }

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

@@ -1,15 +1,14 @@
 using System;
+using System.Collections.Generic;
 using System.Data;
 using System.Windows.Forms;
-using UAS_LabelMachine.PublicMethod;
+
 
 namespace UAS_LabelMachine.CustomControl
 {
     public partial class SearchTextBox : UserControl
     {
-
         DataHelper dh = new DataHelper();
-
         #region 构造函数
         public SearchTextBox()
         {
@@ -263,7 +262,6 @@ namespace UAS_LabelMachine.CustomControl
             SearchIconClick?.Invoke(sender, new EventArgs());
             db = new DbFind(Name, tableName, selectField, setValueField, caller, formName, condition);
             db.Text = DBTitle1;
-            LogManager.DoLog("DbFind查询,发起窗口【" + formName + "】,查询表【" + tableName + "】,字段" + selectField + ",条件" + condition);
             if (db.IsAbleDbFind1)
             {
                 db.ShowDialog();
@@ -338,15 +336,13 @@ namespace UAS_LabelMachine.CustomControl
             }
             try
             {
-                Console.WriteLine(sql);
                 dt = (DataTable)dh.ExecuteSql(sql, "select");
                 if (dt.Rows.Count > 0)
                     ReturnDataToForm();
             }
             catch (Exception e)
             {
-                LogManager.DoLog(e.Message);
             }
         }
     }
-}
+}

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

@@ -146,6 +146,12 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="CustomControl\SearchTextBox.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="CustomControl\SearchTextBox.Designer.cs">
+      <DependentUpon>SearchTextBox.cs</DependentUpon>
+    </Compile>
     <Compile Include="PassWordConfirm.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -230,12 +236,6 @@
     <Compile Include="CustomControl\RichTextAutoBottom.Designer.cs">
       <DependentUpon>RichTextAutoBottom.cs</DependentUpon>
     </Compile>
-    <Compile Include="CustomControl\SearchTextBox.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="CustomControl\SearchTextBox.Designer.cs">
-      <DependentUpon>SearchTextBox.cs</DependentUpon>
-    </Compile>
     <Compile Include="CustomControl\SerialPortCombox.cs">
       <SubType>UserControl</SubType>
     </Compile>
@@ -347,6 +347,9 @@
     <Compile Include="附件内容打印.Designer.cs">
       <DependentUpon>附件内容打印.cs</DependentUpon>
     </Compile>
+    <EmbeddedResource Include="CustomControl\SearchTextBox.resx">
+      <DependentUpon>SearchTextBox.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="PassWordConfirm.resx">
       <DependentUpon>PassWordConfirm.cs</DependentUpon>
     </EmbeddedResource>
@@ -377,9 +380,6 @@
     <EmbeddedResource Include="CustomControl\PrinterCombox.resx">
       <DependentUpon>PrinterCombox.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="CustomControl\SearchTextBox.resx">
-      <DependentUpon>SearchTextBox.cs</DependentUpon>
-    </EmbeddedResource>
     <EmbeddedResource Include="CustomControl\SerialPortCombox.resx">
       <DependentUpon>SerialPortCombox.cs</DependentUpon>
     </EmbeddedResource>

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

@@ -167,6 +167,7 @@
             this.ResetHBXH = new System.Windows.Forms.Button();
             this.label18 = new System.Windows.Forms.Label();
             this.MidBoxEnd = new UAS_LabelMachine.CustomControl.EnterTextBox();
+            this.SingleLabelPrint = new System.Windows.Forms.Button();
             this.MidBoxBegin = new UAS_LabelMachine.CustomControl.EnterTextBox();
             this.label16 = new System.Windows.Forms.Label();
             this.SingleBoxEnd = new UAS_LabelMachine.CustomControl.EnterTextBox();
@@ -217,7 +218,6 @@
             this.label13 = new System.Windows.Forms.Label();
             this.CurrentBoxNum = new System.Windows.Forms.NumericUpDown();
             this.SingleLabelPrinter = new UAS_LabelMachine.CustomControl.PrinterCombox();
-            this.SingleLabelPrint = new System.Windows.Forms.Button();
             this.SingleLabelAutoPrint = new System.Windows.Forms.CheckBox();
             this.SingleLabelCombox = new System.Windows.Forms.ComboBox();
             this.MidLabel = new UAS_LabelMachine.CustomControl.GroupBoxWithBorder.GroupBoxWithBorder();
@@ -1295,7 +1295,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(17, 40);
+            this.label15.Location = new System.Drawing.Point(20, 43);
             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);
@@ -1365,7 +1365,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(75, 128);
+            this.Weight.Location = new System.Drawing.Point(78, 131);
             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);
@@ -1630,7 +1630,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(40, 293);
+            this.label17.Location = new System.Drawing.Point(43, 296);
             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);
@@ -1666,7 +1666,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(145, 191);
+            this.label18.Location = new System.Drawing.Point(148, 194);
             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);
@@ -1685,6 +1685,19 @@
             this.MidBoxEnd.Str2 = null;
             this.MidBoxEnd.TabIndex = 89;
             // 
+            // SingleLabelPrint
+            // 
+            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(68, 359);
+            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);
+            this.SingleLabelPrint.TabIndex = 36;
+            this.SingleLabelPrint.Text = "打印盘标";
+            this.SingleLabelPrint.UseVisualStyleBackColor = true;
+            this.SingleLabelPrint.Click += new System.EventHandler(this.SingleLabelPrint_Click);
+            // 
             // MidBoxBegin
             // 
             this.MidBoxBegin.ID = null;
@@ -1701,7 +1714,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(146, 99);
+            this.label16.Location = new System.Drawing.Point(149, 102);
             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);
@@ -1736,7 +1749,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(40, 146);
+            this.label12.Location = new System.Drawing.Point(43, 149);
             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);
@@ -1747,7 +1760,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(40, 51);
+            this.label7.Location = new System.Drawing.Point(43, 54);
             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);
@@ -2186,7 +2199,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(59, 302);
+            this.label14.Location = new System.Drawing.Point(62, 305);
             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 +2219,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(59, 256);
+            this.label13.Location = new System.Drawing.Point(62, 259);
             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);
@@ -2232,24 +2245,11 @@
             this.SingleLabelPrinter.Size = new System.Drawing.Size(304, 50);
             this.SingleLabelPrinter.TabIndex = 40;
             // 
-            // SingleLabelPrint
-            // 
-            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(23, 359);
-            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);
-            this.SingleLabelPrint.TabIndex = 36;
-            this.SingleLabelPrint.Text = "打印盘标";
-            this.SingleLabelPrint.UseVisualStyleBackColor = true;
-            this.SingleLabelPrint.Click += new System.EventHandler(this.SingleLabelPrint_Click);
-            // 
             // SingleLabelAutoPrint
             // 
             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(38, 205);
+            this.SingleLabelAutoPrint.Location = new System.Drawing.Point(41, 208);
             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);
@@ -2295,7 +2295,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(22, 374);
+            this.AutoPrintMidBox.Location = new System.Drawing.Point(25, 377);
             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);
@@ -2307,7 +2307,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(191, 214);
+            this.CurrentRowOnly.Location = new System.Drawing.Point(194, 217);
             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);
@@ -2338,7 +2338,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(37, 256);
+            this.label2.Location = new System.Drawing.Point(40, 259);
             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);
@@ -2362,7 +2362,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(37, 321);
+            this.label5.Location = new System.Drawing.Point(40, 324);
             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);
@@ -2394,7 +2394,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(39, 214);
+            this.MidLabelAutoPrint.Location = new System.Drawing.Point(42, 217);
             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);
@@ -2448,7 +2448,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(157, 187);
+            this.AutoPrintOutBox.Location = new System.Drawing.Point(160, 190);
             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);
@@ -2460,7 +2460,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(28, 229);
+            this.AutoSetOutBox.Location = new System.Drawing.Point(31, 232);
             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);
@@ -2472,7 +2472,7 @@
             // 
             this.DiffDetno.AutoSize = true;
             this.DiffDetno.Font = new System.Drawing.Font("微软雅黑", 8F);
-            this.DiffDetno.Location = new System.Drawing.Point(270, 381);
+            this.DiffDetno.Location = new System.Drawing.Point(273, 384);
             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);
@@ -2484,7 +2484,7 @@
             // 
             this.DiffCPN.AutoSize = true;
             this.DiffCPN.Font = new System.Drawing.Font("微软雅黑", 8F);
-            this.DiffCPN.Location = new System.Drawing.Point(270, 337);
+            this.DiffCPN.Location = new System.Drawing.Point(273, 340);
             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);
@@ -2496,7 +2496,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(323, 435);
+            this.BoxCount.Location = new System.Drawing.Point(326, 438);
             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);
@@ -2506,7 +2506,7 @@
             // 
             this.DiffLotNo.AutoSize = true;
             this.DiffLotNo.Font = new System.Drawing.Font("微软雅黑", 8F);
-            this.DiffLotNo.Location = new System.Drawing.Point(270, 289);
+            this.DiffLotNo.Location = new System.Drawing.Point(273, 292);
             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);
@@ -2518,7 +2518,7 @@
             // 
             this.DiffDC.AutoSize = true;
             this.DiffDC.Font = new System.Drawing.Font("微软雅黑", 8F);
-            this.DiffDC.Location = new System.Drawing.Point(270, 237);
+            this.DiffDC.Location = new System.Drawing.Point(273, 240);
             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);
@@ -2530,7 +2530,7 @@
             // 
             this.OnlyOneRow.AutoSize = true;
             this.OnlyOneRow.Font = new System.Drawing.Font("微软雅黑", 8F);
-            this.OnlyOneRow.Location = new System.Drawing.Point(270, 189);
+            this.OnlyOneRow.Location = new System.Drawing.Point(273, 192);
             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);
@@ -2542,7 +2542,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(28, 187);
+            this.AllLabel.Location = new System.Drawing.Point(31, 190);
             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);
@@ -2565,7 +2565,7 @@
             // LogingOut
             // 
             this.LogingOut.AutoSize = true;
-            this.LogingOut.Location = new System.Drawing.Point(287, 46);
+            this.LogingOut.Location = new System.Drawing.Point(290, 49);
             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);
@@ -2593,7 +2593,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(68, 329);
+            this.label10.Location = new System.Drawing.Point(71, 332);
             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);
@@ -2604,7 +2604,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(68, 282);
+            this.label6.Location = new System.Drawing.Point(71, 285);
             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);
@@ -2625,11 +2625,16 @@
             this.OutboxCapacity.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.OutboxCapacity.Location = new System.Drawing.Point(122, 267);
             this.OutboxCapacity.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
+            this.OutboxCapacity.Maximum = new decimal(new int[] {
+            180,
+            0,
+            0,
+            0});
             this.OutboxCapacity.Name = "OutboxCapacity";
             this.OutboxCapacity.Size = new System.Drawing.Size(100, 39);
             this.OutboxCapacity.TabIndex = 84;
             this.OutboxCapacity.Value = new decimal(new int[] {
-            60,
+            180,
             0,
             0,
             0});

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

@@ -780,9 +780,9 @@ namespace UAS_LabelMachine
                 for (int i = 0; i < PIBID.Length; i++)
                 {
                     if (i != PIBID.Length - 1)
-                        pibid += PIBID[i] + ",";
+                        pibid += "'" + PIBID[i] + "',";
                     else
-                        pibid += PIBID[i];
+                        pibid += "'" + PIBID[i] + "'";
                 }
                 if (!SingleLabelCombox.SelectedValue.ToString().Contains("System.Data.DataRowView"))
                     SingleReport.Load(SingleLabelCombox.SelectedValue.ToString());
@@ -816,7 +816,7 @@ namespace UAS_LabelMachine
                 }
                 else
                 {
-                    sql.Append("and pc_custprodcode=pd_custprodcode left join WareHouse on wh_code=pd_whcode left join employee on em_code=pib_inman left join ProductBrand on pib_brand = pb_name where pib_id='" + pibid + "' order by pib_custbarcode)prodiosingleinfo_view");
+                    sql.Append("and pc_custprodcode=pd_custprodcode left join WareHouse on wh_code=pd_whcode left join employee on em_code=pib_inman left join ProductBrand on pib_brand = pb_name where pib_id=" + pibid + " order by pib_custbarcode)prodiosingleinfo_view");
                 }
                 DataTable dt = (DataTable)dh.ExecuteSql(sql.ToString(), "select");
                 SingleReport.RegisterData(dt, "prodiosingleinfo_view");
@@ -1047,7 +1047,7 @@ namespace UAS_LabelMachine
                         //勾选了并且未打印
                         if (LabelInf.Rows[i].Cells["Choose"].FormattedValue != null && LabelInf.Rows[i].Cells["Choose"].FormattedValue.ToString().ToLower() == "true")
                         {
-                            pibid += LabelInf.Rows[i].Cells["pib_id1"].Value.ToString() + ",";
+                            pibid += "'" + LabelInf.Rows[i].Cells["pib_id1"].Value.ToString() + "',";
                             LabelInf.Rows[i].Cells["pib_ifprint"].Value = true;
                         }
                     }
@@ -1629,6 +1629,7 @@ namespace UAS_LabelMachine
                 BaseUtil.SetFormCenter(stw);
                 stw.ShowDialog();
                 Input.Focus();
+                OutBoxNum.Text = "新增";
             }
             else
                 MessageBox.Show("未维护外箱标签", "提示");
@@ -2273,7 +2274,7 @@ namespace UAS_LabelMachine
             string SQL = "select pib_outboxcode2||'/'||(select max(to_number(pib_outboxcode2)) from prodiobarcode where pib_inoutno='" + pi_inoutno.Text + "') from prodiobarcode  where pib_id=";
             for (int i = 0; i < dt.Rows.Count; i++)
             {
-                DataTable dt1 = (DataTable)dh.ExecuteSql(SQL + dt.Rows[i]["pib_id"].ToString(), "select");
+                DataTable dt1 = (DataTable)dh.ExecuteSql(SQL + "'" + dt.Rows[i]["pib_id"].ToString() + "'", "select");
                 FootReport.SetParameterValue("唛头", dt1.Rows[0][0].ToString());
                 FootReport.PrintSettings.ShowDialog = false;
                 FootReport.PrintSettings.Printer = SingleLabelPrinter.Text;
@@ -2608,6 +2609,19 @@ namespace UAS_LabelMachine
 
         private void AddNewOutBox_Click(object sender, EventArgs e)
         {
+            if (OutBoxNum1 != "全部" && OutBoxNum1 != "新增")
+                if (dh.getFieldDataByCondition("prodiobarcode", "pib_outifprint", "pib_inoutno='" + pi_inoutno.Text + "' and pib_outboxcode2='" + OutBoxNum1 + "'").ToString() != "-1")
+                {
+                    MessageBox.Show("外箱号" + OutBoxNum1 + "尚未打印标签");
+                }
+            OutBoxNum1 = OutBoxNum.Text;
+            if (OutBoxNum1 == "新增")
+            {
+                PassSixTenCount = 1;
+                PassTenCount = 1;
+                CurrentBoxNum.Value = 0;
+                CurrentOutBoxNum.Value = 0;
+            }
             OutBoxNum.Text = "新增";
         }
 

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

@@ -93,9 +93,10 @@ namespace UAS_LabelMachine
             // 
             this.cl_code_label.AutoSize = true;
             this.cl_code_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.cl_code_label.Location = new System.Drawing.Point(31, 15);
+            this.cl_code_label.Location = new System.Drawing.Point(62, 30);
+            this.cl_code_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.cl_code_label.Name = "cl_code_label";
-            this.cl_code_label.Size = new System.Drawing.Size(74, 21);
+            this.cl_code_label.Size = new System.Drawing.Size(146, 41);
             this.cl_code_label.TabIndex = 145;
             this.cl_code_label.Text = "客户编号";
             // 
@@ -103,9 +104,10 @@ namespace UAS_LabelMachine
             // 
             this.cu_name_label.AutoSize = true;
             this.cu_name_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.cu_name_label.Location = new System.Drawing.Point(325, 16);
+            this.cu_name_label.Location = new System.Drawing.Point(650, 32);
+            this.cu_name_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.cu_name_label.Name = "cu_name_label";
-            this.cu_name_label.Size = new System.Drawing.Size(74, 21);
+            this.cu_name_label.Size = new System.Drawing.Size(146, 41);
             this.cu_name_label.TabIndex = 144;
             this.cu_name_label.Text = "客户名称";
             // 
@@ -117,9 +119,10 @@ namespace UAS_LabelMachine
             // 
             this.label1.AutoSize = true;
             this.label1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label1.Location = new System.Drawing.Point(919, 89);
+            this.label1.Location = new System.Drawing.Point(1838, 178);
+            this.label1.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(106, 21);
+            this.label1.Size = new System.Drawing.Size(210, 41);
             this.label1.TabIndex = 164;
             this.label1.Text = "模板参数预览";
             // 
@@ -127,17 +130,19 @@ namespace UAS_LabelMachine
             // 
             this.PrinterList_lable.AutoSize = true;
             this.PrinterList_lable.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.PrinterList_lable.Location = new System.Drawing.Point(920, 21);
+            this.PrinterList_lable.Location = new System.Drawing.Point(1840, 42);
+            this.PrinterList_lable.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.PrinterList_lable.Name = "PrinterList_lable";
-            this.PrinterList_lable.Size = new System.Drawing.Size(90, 21);
+            this.PrinterList_lable.Size = new System.Drawing.Size(178, 41);
             this.PrinterList_lable.TabIndex = 175;
             this.PrinterList_lable.Text = "打印机列表";
             // 
             // OpenFolder
             // 
-            this.OpenFolder.Location = new System.Drawing.Point(562, 490);
+            this.OpenFolder.Location = new System.Drawing.Point(1124, 980);
+            this.OpenFolder.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.OpenFolder.Name = "OpenFolder";
-            this.OpenFolder.Size = new System.Drawing.Size(75, 27);
+            this.OpenFolder.Size = new System.Drawing.Size(150, 54);
             this.OpenFolder.TabIndex = 156;
             this.OpenFolder.Text = "打开";
             this.OpenFolder.UseVisualStyleBackColor = true;
@@ -147,27 +152,30 @@ namespace UAS_LabelMachine
             // 
             this.label3.AutoSize = true;
             this.label3.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label3.Location = new System.Drawing.Point(283, 453);
+            this.label3.Location = new System.Drawing.Point(566, 906);
+            this.label3.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(74, 21);
+            this.label3.Size = new System.Drawing.Size(146, 41);
             this.label3.TabIndex = 171;
             this.label3.Text = "盘标类型";
             // 
             // FolderPath
             // 
             this.FolderPath.Enabled = false;
-            this.FolderPath.Location = new System.Drawing.Point(379, 493);
+            this.FolderPath.Location = new System.Drawing.Point(758, 986);
+            this.FolderPath.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.FolderPath.Name = "FolderPath";
-            this.FolderPath.Size = new System.Drawing.Size(161, 21);
+            this.FolderPath.Size = new System.Drawing.Size(318, 35);
             this.FolderPath.TabIndex = 157;
             // 
             // FolderPath_Label
             // 
             this.FolderPath_Label.AutoSize = true;
             this.FolderPath_Label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.FolderPath_Label.Location = new System.Drawing.Point(283, 493);
+            this.FolderPath_Label.Location = new System.Drawing.Point(566, 986);
+            this.FolderPath_Label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.FolderPath_Label.Name = "FolderPath_Label";
-            this.FolderPath_Label.Size = new System.Drawing.Size(74, 21);
+            this.FolderPath_Label.Size = new System.Drawing.Size(146, 41);
             this.FolderPath_Label.TabIndex = 158;
             this.FolderPath_Label.Text = "模板路径";
             // 
@@ -180,24 +188,27 @@ namespace UAS_LabelMachine
             "单盘",
             "中盒",
             "外箱"});
-            this.la_type1.Location = new System.Drawing.Point(379, 454);
+            this.la_type1.Location = new System.Drawing.Point(758, 908);
+            this.la_type1.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.la_type1.Name = "la_type1";
-            this.la_type1.Size = new System.Drawing.Size(161, 20);
+            this.la_type1.Size = new System.Drawing.Size(318, 32);
             this.la_type1.TabIndex = 169;
             // 
             // cl_custcode_label
             // 
             this.cl_custcode_label.AutoSize = true;
             this.cl_custcode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.cl_custcode_label.Location = new System.Drawing.Point(20, 450);
+            this.cl_custcode_label.Location = new System.Drawing.Point(40, 900);
+            this.cl_custcode_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.cl_custcode_label.Name = "cl_custcode_label";
-            this.cl_custcode_label.Size = new System.Drawing.Size(74, 21);
+            this.cl_custcode_label.Size = new System.Drawing.Size(146, 41);
             this.cl_custcode_label.TabIndex = 167;
             this.cl_custcode_label.Text = "客户编号";
             // 
             // dataGridViewCheckBoxColumn1
             // 
             this.dataGridViewCheckBoxColumn1.HeaderText = "";
+            this.dataGridViewCheckBoxColumn1.MinimumWidth = 10;
             this.dataGridViewCheckBoxColumn1.Name = "dataGridViewCheckBoxColumn1";
             this.dataGridViewCheckBoxColumn1.Width = 30;
             // 
@@ -205,9 +216,10 @@ namespace UAS_LabelMachine
             // 
             this.la_code_label.AutoSize = true;
             this.la_code_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.la_code_label.Location = new System.Drawing.Point(563, 453);
+            this.la_code_label.Location = new System.Drawing.Point(1126, 906);
+            this.la_code_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.la_code_label.Name = "la_code_label";
-            this.la_code_label.Size = new System.Drawing.Size(74, 21);
+            this.la_code_label.Size = new System.Drawing.Size(146, 41);
             this.la_code_label.TabIndex = 178;
             this.la_code_label.Text = "模板编号";
             // 
@@ -215,9 +227,10 @@ namespace UAS_LabelMachine
             // 
             this.NetURL_label.AutoSize = true;
             this.NetURL_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.NetURL_label.Location = new System.Drawing.Point(936, 49);
+            this.NetURL_label.Location = new System.Drawing.Point(1872, 98);
+            this.NetURL_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.NetURL_label.Name = "NetURL_label";
-            this.NetURL_label.Size = new System.Drawing.Size(74, 21);
+            this.NetURL_label.Size = new System.Drawing.Size(146, 41);
             this.NetURL_label.TabIndex = 181;
             this.NetURL_label.Text = "网络路径";
             // 
@@ -225,9 +238,10 @@ namespace UAS_LabelMachine
             // 
             this.cl_labeltype_label.AutoSize = true;
             this.cl_labeltype_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.cl_labeltype_label.Location = new System.Drawing.Point(609, 15);
+            this.cl_labeltype_label.Location = new System.Drawing.Point(1218, 30);
+            this.cl_labeltype_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.cl_labeltype_label.Name = "cl_labeltype_label";
-            this.cl_labeltype_label.Size = new System.Drawing.Size(74, 21);
+            this.cl_labeltype_label.Size = new System.Drawing.Size(146, 41);
             this.cl_labeltype_label.TabIndex = 185;
             this.cl_labeltype_label.Text = "盘标类型";
             // 
@@ -236,9 +250,10 @@ namespace UAS_LabelMachine
             this.la_type.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.la_type.DropDownWidth = 161;
             this.la_type.FormattingEnabled = true;
-            this.la_type.Location = new System.Drawing.Point(705, 16);
+            this.la_type.Location = new System.Drawing.Point(1410, 32);
+            this.la_type.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.la_type.Name = "la_type";
-            this.la_type.Size = new System.Drawing.Size(161, 20);
+            this.la_type.Size = new System.Drawing.Size(318, 32);
             this.la_type.TabIndex = 184;
             this.la_type.Tag = "cl_labeltype";
             // 
@@ -246,27 +261,30 @@ namespace UAS_LabelMachine
             // 
             this.la_name.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
-            this.la_name.Location = new System.Drawing.Point(116, 493);
+            this.la_name.Location = new System.Drawing.Point(232, 986);
+            this.la_name.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.la_name.Name = "la_name";
-            this.la_name.Size = new System.Drawing.Size(1, 21);
+            this.la_name.Size = new System.Drawing.Size(0, 35);
             this.la_name.TabIndex = 186;
             // 
             // la_name_label
             // 
             this.la_name_label.AutoSize = true;
             this.la_name_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.la_name_label.Location = new System.Drawing.Point(20, 493);
+            this.la_name_label.Location = new System.Drawing.Point(40, 986);
+            this.la_name_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.la_name_label.Name = "la_name_label";
-            this.la_name_label.Size = new System.Drawing.Size(74, 21);
+            this.la_name_label.Size = new System.Drawing.Size(146, 41);
             this.la_name_label.TabIndex = 187;
             this.la_name_label.Text = "模板名称";
             // 
             // FTPShare
             // 
             this.FTPShare.AutoSize = true;
-            this.FTPShare.Location = new System.Drawing.Point(659, 497);
+            this.FTPShare.Location = new System.Drawing.Point(1318, 994);
+            this.FTPShare.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.FTPShare.Name = "FTPShare";
-            this.FTPShare.Size = new System.Drawing.Size(66, 16);
+            this.FTPShare.Size = new System.Drawing.Size(126, 28);
             this.FTPShare.TabIndex = 188;
             this.FTPShare.Text = "FTP共享";
             this.FTPShare.UseVisualStyleBackColor = true;
@@ -277,9 +295,10 @@ namespace UAS_LabelMachine
             this.FastReport.AutoSize = true;
             this.FastReport.Checked = true;
             this.FastReport.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.FastReport.Location = new System.Drawing.Point(1058, 86);
+            this.FastReport.Location = new System.Drawing.Point(2116, 172);
+            this.FastReport.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.FastReport.Name = "FastReport";
-            this.FastReport.Size = new System.Drawing.Size(110, 25);
+            this.FastReport.Size = new System.Drawing.Size(214, 45);
             this.FastReport.TabIndex = 161;
             this.FastReport.TabStop = true;
             this.FastReport.Text = "FastReport";
@@ -288,9 +307,10 @@ namespace UAS_LabelMachine
             // 
             // pictureBox1
             // 
-            this.pictureBox1.Location = new System.Drawing.Point(918, 138);
+            this.pictureBox1.Location = new System.Drawing.Point(1836, 276);
+            this.pictureBox1.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.pictureBox1.Name = "pictureBox1";
-            this.pictureBox1.Size = new System.Drawing.Size(254, 300);
+            this.pictureBox1.Size = new System.Drawing.Size(508, 600);
             this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
             this.pictureBox1.TabIndex = 191;
             this.pictureBox1.TabStop = false;
@@ -298,18 +318,19 @@ namespace UAS_LabelMachine
             // pagination1
             // 
             this.pagination1.Cursor = System.Windows.Forms.Cursors.Hand;
-            this.pagination1.Location = new System.Drawing.Point(0, 550);
-            this.pagination1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.pagination1.Location = new System.Drawing.Point(0, 1100);
+            this.pagination1.Margin = new System.Windows.Forms.Padding(8, 8, 8, 8);
             this.pagination1.Name = "pagination1";
-            this.pagination1.Size = new System.Drawing.Size(1179, 31);
+            this.pagination1.Size = new System.Drawing.Size(2358, 62);
             this.pagination1.TabIndex = 190;
             // 
             // NewLabel
             // 
             this.NewLabel.Image = ((System.Drawing.Image)(resources.GetObject("NewLabel.Image")));
-            this.NewLabel.Location = new System.Drawing.Point(846, 490);
+            this.NewLabel.Location = new System.Drawing.Point(1692, 980);
+            this.NewLabel.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.NewLabel.Name = "NewLabel";
-            this.NewLabel.Size = new System.Drawing.Size(61, 24);
+            this.NewLabel.Size = new System.Drawing.Size(122, 48);
             this.NewLabel.TabIndex = 189;
             this.NewLabel.Tag = "IfWrite";
             this.NewLabel.Text = "新增标签";
@@ -319,9 +340,10 @@ namespace UAS_LabelMachine
             // NetURL
             // 
             this.NetURL.ID = null;
-            this.NetURL.Location = new System.Drawing.Point(1026, 49);
+            this.NetURL.Location = new System.Drawing.Point(2052, 98);
+            this.NetURL.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.NetURL.Name = "NetURL";
-            this.NetURL.Size = new System.Drawing.Size(122, 21);
+            this.NetURL.Size = new System.Drawing.Size(240, 35);
             this.NetURL.Str = null;
             this.NetURL.Str1 = null;
             this.NetURL.Str2 = null;
@@ -337,13 +359,14 @@ namespace UAS_LabelMachine
             this.la_code.Condition = null;
             this.la_code.DBTitle = null;
             this.la_code.FormName = null;
-            this.la_code.Location = new System.Drawing.Point(659, 455);
+            this.la_code.Location = new System.Drawing.Point(1318, 910);
+            this.la_code.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.la_code.Name = "la_code";
             this.la_code.Power = null;
             this.la_code.ReturnData = null;
             this.la_code.SelectField = null;
             this.la_code.SetValueField = null;
-            this.la_code.Size = new System.Drawing.Size(161, 21);
+            this.la_code.Size = new System.Drawing.Size(322, 42);
             this.la_code.TabIndex = 179;
             this.la_code.TableName = null;
             this.la_code.Tag = "la_code";
@@ -352,9 +375,10 @@ namespace UAS_LabelMachine
             // Save
             // 
             this.Save.Image = ((System.Drawing.Image)(resources.GetObject("Save.Image")));
-            this.Save.Location = new System.Drawing.Point(759, 491);
+            this.Save.Location = new System.Drawing.Point(1518, 982);
+            this.Save.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.Save.Name = "Save";
-            this.Save.Size = new System.Drawing.Size(61, 24);
+            this.Save.Size = new System.Drawing.Size(122, 48);
             this.Save.TabIndex = 170;
             this.Save.Tag = "IfWrite";
             this.Save.Text = "保存";
@@ -363,19 +387,20 @@ namespace UAS_LabelMachine
             // 
             // ChooseAll
             // 
-            this.ChooseAll.Location = new System.Drawing.Point(19, 92);
+            this.ChooseAll.Location = new System.Drawing.Point(38, 184);
+            this.ChooseAll.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.ChooseAll.Name = "ChooseAll";
-            this.ChooseAll.Size = new System.Drawing.Size(40, 21);
+            this.ChooseAll.Size = new System.Drawing.Size(80, 42);
             this.ChooseAll.TabIndex = 177;
             this.ChooseAll.Text = "全选";
             this.ChooseAll.UseVisualStyleBackColor = true;
             // 
             // PrinterList
             // 
-            this.PrinterList.Location = new System.Drawing.Point(1026, 22);
-            this.PrinterList.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.PrinterList.Location = new System.Drawing.Point(2052, 44);
+            this.PrinterList.Margin = new System.Windows.Forms.Padding(8, 8, 8, 8);
             this.PrinterList.Name = "PrinterList";
-            this.PrinterList.Size = new System.Drawing.Size(121, 20);
+            this.PrinterList.Size = new System.Drawing.Size(242, 40);
             this.PrinterList.TabIndex = 174;
             // 
             // LabelDataGridView
@@ -383,6 +408,7 @@ namespace UAS_LabelMachine
             this.LabelDataGridView.AllowUserToAddRows = false;
             this.LabelDataGridView.AllowUserToResizeRows = false;
             this.LabelDataGridView.BackgroundColor = System.Drawing.SystemColors.ButtonFace;
+            this.LabelDataGridView.ColumnHeadersHeight = 46;
             this.LabelDataGridView.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
             this.Choose,
             this.la_id,
@@ -398,7 +424,8 @@ namespace UAS_LabelMachine
             this.cl_detno,
             this.cl_labelsoft,
             this.cl_status});
-            this.LabelDataGridView.Location = new System.Drawing.Point(17, 90);
+            this.LabelDataGridView.Location = new System.Drawing.Point(34, 180);
+            this.LabelDataGridView.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.LabelDataGridView.Name = "LabelDataGridView";
             dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
             dataGridViewCellStyle1.BackColor = System.Drawing.Color.Blue;
@@ -408,11 +435,12 @@ namespace UAS_LabelMachine
             dataGridViewCellStyle1.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(128)))));
             dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
             this.LabelDataGridView.RowHeadersDefaultCellStyle = dataGridViewCellStyle1;
+            this.LabelDataGridView.RowHeadersWidth = 82;
             dataGridViewCellStyle2.BackColor = System.Drawing.Color.White;
             this.LabelDataGridView.RowsDefaultCellStyle = dataGridViewCellStyle2;
             this.LabelDataGridView.RowTemplate.Height = 23;
             this.LabelDataGridView.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
-            this.LabelDataGridView.Size = new System.Drawing.Size(890, 348);
+            this.LabelDataGridView.Size = new System.Drawing.Size(1780, 696);
             this.LabelDataGridView.TabIndex = 172;
             this.LabelDataGridView.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.LabelDataGridView_CellContentClick);
             this.LabelDataGridView.CellContentDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.LabelDataGridView_CellContentDoubleClick);
@@ -423,6 +451,7 @@ namespace UAS_LabelMachine
             // 
             this.Choose.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
             this.Choose.HeaderText = "勾选";
+            this.Choose.MinimumWidth = 10;
             this.Choose.Name = "Choose";
             this.Choose.Resizable = System.Windows.Forms.DataGridViewTriState.False;
             this.Choose.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
@@ -432,99 +461,126 @@ namespace UAS_LabelMachine
             // 
             this.la_id.DataPropertyName = "la_id";
             this.la_id.HeaderText = "la_id";
+            this.la_id.MinimumWidth = 10;
             this.la_id.Name = "la_id";
             this.la_id.Visible = false;
+            this.la_id.Width = 200;
             // 
             // cu_name1
             // 
             this.cu_name1.DataPropertyName = "cu_name";
             this.cu_name1.HeaderText = "客户名称";
+            this.cu_name1.MinimumWidth = 10;
             this.cu_name1.Name = "cu_name1";
             this.cu_name1.ReadOnly = true;
+            this.cu_name1.Width = 200;
             // 
             // cl_id
             // 
             this.cl_id.DataPropertyName = "cl_id";
             this.cl_id.HeaderText = "cl_id";
+            this.cl_id.MinimumWidth = 10;
             this.cl_id.Name = "cl_id";
             this.cl_id.Visible = false;
+            this.cl_id.Width = 200;
             // 
             // CL_CUSTCODE2
             // 
             this.CL_CUSTCODE2.DataPropertyName = "cl_custcode";
             this.CL_CUSTCODE2.HeaderText = "客户编号";
+            this.CL_CUSTCODE2.MinimumWidth = 10;
             this.CL_CUSTCODE2.Name = "CL_CUSTCODE2";
             this.CL_CUSTCODE2.ReadOnly = true;
+            this.CL_CUSTCODE2.Width = 200;
             // 
             // cl_labeltype
             // 
             this.cl_labeltype.DataPropertyName = "cl_labeltype";
             this.cl_labeltype.HeaderText = "标签类型";
+            this.cl_labeltype.MinimumWidth = 10;
             this.cl_labeltype.Name = "cl_labeltype";
             this.cl_labeltype.ReadOnly = true;
+            this.cl_labeltype.Width = 200;
             // 
             // cl_labelcode
             // 
             this.cl_labelcode.DataPropertyName = "cl_labelcode";
             this.cl_labelcode.HeaderText = "模板编号";
+            this.cl_labelcode.MinimumWidth = 10;
             this.cl_labelcode.Name = "cl_labelcode";
             this.cl_labelcode.ReadOnly = true;
+            this.cl_labelcode.Width = 200;
             // 
             // cl_labelurl
             // 
             this.cl_labelurl.DataPropertyName = "cl_labelurl";
             this.cl_labelurl.HeaderText = "模板路径";
+            this.cl_labelurl.MinimumWidth = 10;
             this.cl_labelurl.Name = "cl_labelurl";
             this.cl_labelurl.ReadOnly = true;
+            this.cl_labelurl.Width = 200;
             // 
             // cl_labelname
             // 
             this.cl_labelname.DataPropertyName = "cl_labelname";
             this.cl_labelname.HeaderText = "模板名称";
+            this.cl_labelname.MinimumWidth = 10;
             this.cl_labelname.Name = "cl_labelname";
             this.cl_labelname.ReadOnly = true;
+            this.cl_labelname.Width = 200;
             // 
             // cl_date
             // 
             this.cl_date.DataPropertyName = "cl_date";
             this.cl_date.HeaderText = "最后修改时间";
+            this.cl_date.MinimumWidth = 10;
             this.cl_date.Name = "cl_date";
             this.cl_date.ReadOnly = true;
+            this.cl_date.Width = 200;
             // 
             // cl_isdefault
             // 
             this.cl_isdefault.DataPropertyName = "cl_isdefault";
             this.cl_isdefault.HeaderText = "是否默认";
+            this.cl_isdefault.MinimumWidth = 10;
             this.cl_isdefault.Name = "cl_isdefault";
             this.cl_isdefault.ReadOnly = true;
+            this.cl_isdefault.Width = 200;
             // 
             // cl_detno
             // 
             this.cl_detno.DataPropertyName = "cl_detno";
             this.cl_detno.HeaderText = "序号";
+            this.cl_detno.MinimumWidth = 10;
             this.cl_detno.Name = "cl_detno";
             this.cl_detno.ReadOnly = true;
+            this.cl_detno.Width = 200;
             // 
             // cl_labelsoft
             // 
             this.cl_labelsoft.DataPropertyName = "cl_labelsoft";
             this.cl_labelsoft.HeaderText = "标签软件";
+            this.cl_labelsoft.MinimumWidth = 10;
             this.cl_labelsoft.Name = "cl_labelsoft";
             this.cl_labelsoft.ReadOnly = true;
+            this.cl_labelsoft.Width = 200;
             // 
             // cl_status
             // 
             this.cl_status.DataPropertyName = "cl_status";
             this.cl_status.HeaderText = "状态";
+            this.cl_status.MinimumWidth = 10;
             this.cl_status.Name = "cl_status";
             this.cl_status.ReadOnly = true;
+            this.cl_status.Width = 200;
             // 
             // PrintTest
             // 
             this.PrintTest.Image = ((System.Drawing.Image)(resources.GetObject("PrintTest.Image")));
-            this.PrintTest.Location = new System.Drawing.Point(1016, 455);
+            this.PrintTest.Location = new System.Drawing.Point(2032, 910);
+            this.PrintTest.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.PrintTest.Name = "PrintTest";
-            this.PrintTest.Size = new System.Drawing.Size(61, 24);
+            this.PrintTest.Size = new System.Drawing.Size(122, 48);
             this.PrintTest.TabIndex = 166;
             this.PrintTest.Tag = "Print";
             this.PrintTest.Text = "打印测试";
@@ -538,13 +594,14 @@ namespace UAS_LabelMachine
             this.客户编号.Condition = null;
             this.客户编号.DBTitle = null;
             this.客户编号.FormName = null;
-            this.客户编号.Location = new System.Drawing.Point(116, 453);
+            this.客户编号.Location = new System.Drawing.Point(232, 906);
+            this.客户编号.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.客户编号.Name = "客户编号";
             this.客户编号.Power = null;
             this.客户编号.ReturnData = null;
             this.客户编号.SelectField = null;
             this.客户编号.SetValueField = null;
-            this.客户编号.Size = new System.Drawing.Size(136, 21);
+            this.客户编号.Size = new System.Drawing.Size(272, 42);
             this.客户编号.TabIndex = 168;
             this.客户编号.TableName = null;
             this.客户编号.Tag = "cu_code";
@@ -557,13 +614,14 @@ namespace UAS_LabelMachine
             this.cu_code.Condition = null;
             this.cu_code.DBTitle = null;
             this.cu_code.FormName = null;
-            this.cu_code.Location = new System.Drawing.Point(127, 16);
+            this.cu_code.Location = new System.Drawing.Point(254, 32);
+            this.cu_code.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.cu_code.Name = "cu_code";
             this.cu_code.Power = null;
             this.cu_code.ReturnData = null;
             this.cu_code.SelectField = null;
             this.cu_code.SetValueField = null;
-            this.cu_code.Size = new System.Drawing.Size(150, 21);
+            this.cu_code.Size = new System.Drawing.Size(300, 42);
             this.cu_code.TabIndex = 159;
             this.cu_code.TableName = null;
             this.cu_code.Tag = "cl_custcode";
@@ -572,9 +630,10 @@ namespace UAS_LabelMachine
             // UpdateGrid
             // 
             this.UpdateGrid.Image = ((System.Drawing.Image)(resources.GetObject("UpdateGrid.Image")));
-            this.UpdateGrid.Location = new System.Drawing.Point(695, 49);
+            this.UpdateGrid.Location = new System.Drawing.Point(1390, 98);
+            this.UpdateGrid.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.UpdateGrid.Name = "UpdateGrid";
-            this.UpdateGrid.Size = new System.Drawing.Size(61, 24);
+            this.UpdateGrid.Size = new System.Drawing.Size(122, 48);
             this.UpdateGrid.TabIndex = 154;
             this.UpdateGrid.Tag = "IfWrite";
             this.UpdateGrid.Text = "更新";
@@ -584,9 +643,10 @@ namespace UAS_LabelMachine
             // Screen
             // 
             this.Screen.Image = ((System.Drawing.Image)(resources.GetObject("Screen.Image")));
-            this.Screen.Location = new System.Drawing.Point(582, 49);
+            this.Screen.Location = new System.Drawing.Point(1164, 98);
+            this.Screen.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.Screen.Name = "Screen";
-            this.Screen.Size = new System.Drawing.Size(61, 24);
+            this.Screen.Size = new System.Drawing.Size(122, 48);
             this.Screen.TabIndex = 153;
             this.Screen.Tag = "IfRead";
             this.Screen.Text = "筛选";
@@ -596,9 +656,10 @@ namespace UAS_LabelMachine
             // cu_name
             // 
             this.cu_name.ID = null;
-            this.cu_name.Location = new System.Drawing.Point(419, 16);
+            this.cu_name.Location = new System.Drawing.Point(838, 32);
+            this.cu_name.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.cu_name.Name = "cu_name";
-            this.cu_name.Size = new System.Drawing.Size(150, 21);
+            this.cu_name.Size = new System.Drawing.Size(296, 35);
             this.cu_name.Str = null;
             this.cu_name.Str1 = null;
             this.cu_name.Str2 = null;
@@ -607,9 +668,9 @@ namespace UAS_LabelMachine
             // 
             // 客户标签维护
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 24F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1179, 581);
+            this.ClientSize = new System.Drawing.Size(2358, 1162);
             this.Controls.Add(this.pictureBox1);
             this.Controls.Add(this.pagination1);
             this.Controls.Add(this.NewLabel);
@@ -643,6 +704,7 @@ namespace UAS_LabelMachine
             this.Controls.Add(this.cu_name);
             this.Controls.Add(this.cl_code_label);
             this.Controls.Add(this.cu_name_label);
+            this.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.Name = "客户标签维护";
             this.Tag = "Make!CustLabel";
             this.Text = "客户标签维护";
@@ -651,7 +713,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(true);
+            this.ResumeLayout(false);
             this.PerformLayout();
 
         }

UAS_MES_ODLF/App.config

@@ -72,7 +72,7 @@
   <applicationSettings>
     <UAS_MES_NEW.Properties.Settings>
       <setting name="MES" serializeAs="String">
-        <value>Connection Timeout=0;Pooling=false;Password=select!#%*(;User ID=MES;Pooling=false;Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=192.168.1.23)(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=orcl)));</value>
+        <value>Connection Timeout=0;Pooling=false;Password=select!#%*(;User ID=MES;Pooling=false;Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=192.168.100.23)(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=orcl)));</value>
       </setting>
     </UAS_MES_NEW.Properties.Settings>
     <UAS_MES.Properties.Settings>

UAS_MES_ODLF/FunctionCode/Special/Special_CancelCollection.cs

@@ -103,6 +103,7 @@ namespace UAS_MES_NEW.Special
                 sqls.Add("update  makeimeilist set mil_status=0,mil_sncode='' where ( mil_sncode='" + sn_code.Text + "' or mil_psn='" + sn_code.Text + "') and mil_makecode='" + ms_makecode + "'");
                 //更新MAC使用记录
                 sqls.Add("update  makeaddresslist set mal_status=0,mal_sncode='' where mal_sncode='" + sn_code.Text + "' and mal_makecode='" + ms_makecode + "'");
+                sqls.Add("delete from makesnrelation where (sn='"+sn_code.Text+"' or beforesn='"+sn_code.Text+"') and makecode='"+ms_makecode+"'");
 
                 sqls.Add("update makesnlist set msl_status=0 where msl_sncode='" + sn_code.Text + "' and msl_makecode='" + ms_makecode + "' and msl_type='before'");
                 ////初始化号段状态

UAS_MES_ODLF/Properties/Settings.Designer.cs

@@ -12,7 +12,7 @@ namespace UAS_MES_NEW.Properties {
     
     
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "14.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.6.0.0")]
     internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
         
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
@@ -122,8 +122,8 @@ namespace UAS_MES_NEW.Properties {
         [global::System.Configuration.ApplicationScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.Configuration.DefaultSettingValueAttribute("Connection Timeout=0;Pooling=false;Password=select!#%*(;User ID=MES;Pooling=false" +
-            ";Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=192.168.1.2" +
-            "3)(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=orcl)));")]
+            ";Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=192.168.100" +
+            ".23)(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=orcl)));")]
         public string MES {
             get {
                 return ((string)(this["MES"]));

UAS_MES_ODLF/Properties/Settings.settings

@@ -27,7 +27,7 @@
       <Value Profile="(Default)">\\172.16.66.51\lable</Value>
     </Setting>
     <Setting Name="MES" Type="System.String" Scope="Application">
-      <Value Profile="(Default)">Connection Timeout=0;Pooling=false;Password=select!#%*(;User ID=MES;Pooling=false;Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=192.168.1.23)(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=orcl)));</Value>
+      <Value Profile="(Default)">Connection Timeout=0;Pooling=false;Password=select!#%*(;User ID=MES;Pooling=false;Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=192.168.100.23)(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=orcl)));</Value>
     </Setting>
   </Settings>
 </SettingsFile>