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

UAS-出货标签管理(吉利通)/CustomControl/GroupBoxWithBorder.cs

@@ -18,9 +18,9 @@ namespace UAS_LabelMachine.CustomControl.GroupBoxWithBorder
             Pen LineColor = Pens.Gray;
             e.Graphics.DrawLine(LineColor, 1, 7, 8, 7);
             e.Graphics.DrawLine(LineColor, e.Graphics.MeasureString(this.Text, this.Font).Width + 8, 7, this.Width - 2, 7);
-            //e.Graphics.DrawLine(LineColor, 1, 7, 1, this.Height - 2);
-            //e.Graphics.DrawLine(LineColor, 1, this.Height - 2, this.Width - 2, this.Height - 2);
-            //e.Graphics.DrawLine(LineColor, this.Width - 2, 7, this.Width - 2, this.Height - 2);
+            e.Graphics.DrawLine(LineColor, 1, 7, 1, this.Height - 2);
+            e.Graphics.DrawLine(LineColor, 1, this.Height - 2, this.Width - 2, this.Height - 2);
+            e.Graphics.DrawLine(LineColor, this.Width - 2, 7, this.Width - 2, this.Height - 2);
         }
     }
 }

UAS-出货标签管理(吉利通)/PublicMethod/DataHelper.cs

@@ -22,27 +22,27 @@ namespace UAS_LabelMachine
         ////需要显示的账套
         //public static readonly string Masters = "JDTSY,FW_JDT,N_DATACENTER,FY_TEST,JD_TEST,XY_TEST,FW_TEST,DATACENTER,FW,XY,FY";
 
-        //怡海能达外网地址
-        private readonly string ConnectionStrings = "Connection Timeout=0;Pooling=false;Password=select!#%*(;User ID=DATACENTER;Pooling=false;Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=sz.hi-mantech.com)(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=orcl)));";
-        //怡海能达ERP地址
-        public static readonly string ERPAddesss = "http://sz.hi-mantech.com:8099/ERP/";
-        //怡海能达FTP
-        public static readonly string FTPAdress = "ftp://sz.hi-mantech.com:46688|yhndftp|Stga28ytG8";
-        //Oracle端口
-        public static readonly string OraclePort = "1521";
-        //需要显示的账套
-        public static readonly string Masters = "YHND_SZ,YHND_HK,DATACENTER";
-
-        ////华商龙外网地址
-        //private readonly string ConnectionStrings = "Connection Timeout=0;Pooling=false;Password=select!#%*(;User ID=YITOA_DATACENTER;Pooling=false;Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=218.18.115.198)(PORT=1523)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=orcl)));";
-        ////华商龙ERP地址
-        //public static readonly string ERPAddesss = "http://218.18.115.198:8888/ERP/";
-        ////华商龙FTP
-        //public static readonly string FTPAdress = "ftp://218.18.115.198:21|Print|Administrator1@#";
+        ////怡海能达外网地址
+        //private readonly string ConnectionStrings = "Connection Timeout=0;Pooling=false;Password=select!#%*(;User ID=DATACENTER;Pooling=false;Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=sz.hi-mantech.com)(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=orcl)));";
+        ////怡海能达ERP地址
+        //public static readonly string ERPAddesss = "http://sz.hi-mantech.com:8099/ERP/";
+        ////怡海能达FTP
+        //public static readonly string FTPAdress = "ftp://sz.hi-mantech.com:46688|yhndftp|Stga28ytG8";
         ////Oracle端口
-        //public static readonly string OraclePort = "1523";
+        //public static readonly string OraclePort = "1521";
         ////需要显示的账套
-        //public static readonly string Masters = "XSQ,N_YITOA_YWC,ZXN,N_YITOA_LHCT,N_YITOA_CT,N_CHL,N_YITOA_HK,N_HUASL_SHTL,N_WILICHK,N_WILIC,N_E_SHINE_SH,N_SHBJ,N_BJKG,N_HUASL,N_HUASL_QD,N_HUASL_XM,N_HUASL_SZ";
+        //public static readonly string Masters = "YHND_SZ,YHND_HK,DATACENTER";
+
+        //华商龙外网地址
+        private readonly string ConnectionStrings = "Connection Timeout=0;Pooling=false;Password=select!#%*(;User ID=YITOA_DATACENTER;Pooling=false;Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=218.18.115.198)(PORT=1523)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=orcl)));";
+        //华商龙ERP地址
+        public static readonly string ERPAddesss = "http://218.18.115.198:8888/ERP/";
+        //华商龙FTP
+        public static readonly string FTPAdress = "ftp://218.18.115.198:21|Print|Administrator1@#";
+        //Oracle端口
+        public static readonly string OraclePort = "1523";
+        //需要显示的账套
+        public static readonly string Masters = "N_HUASL_SZ";
 
         ////泽天外网地址
         //private readonly string ConnectionStrings = "Connection Timeout=0;Pooling=false;Password=select!#%*(;User ID=ZT_TEST;Pooling=false;Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=183.47.41.2)(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=orcl)));";

UAS-出货标签管理(吉利通)/UAS-出货标签管理(吉利通).csproj

@@ -292,6 +292,12 @@
     </Compile>
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="采集策略_NEW.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="采集策略_NEW.Designer.cs">
+      <DependentUpon>采集策略_NEW.cs</DependentUpon>
+    </Compile>
     <Compile Include="采集策略.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -365,6 +371,9 @@
       <DependentUpon>Resources.resx</DependentUpon>
       <DesignTime>True</DesignTime>
     </Compile>
+    <EmbeddedResource Include="采集策略_NEW.resx">
+      <DependentUpon>采集策略_NEW.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="采集策略.resx">
       <DependentUpon>采集策略.cs</DependentUpon>
     </EmbeddedResource>

UAS-出货标签管理(吉利通)/UAS_出货标签管理.Designer.cs

@@ -140,8 +140,6 @@
             this.pr_unit = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.pib_lotno = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.pib_datecode = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.pib_cusbarcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.pib_cusoutboxcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.pib_datecode1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.pib_qty = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.pib_barcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -177,7 +175,6 @@
             this.label6 = new System.Windows.Forms.Label();
             this.OutBoxPrinter = new UAS_LabelMachine.CustomControl.PrinterCombox();
             this.OutboxCapacity = new System.Windows.Forms.NumericUpDown();
-            this.OutBoxLabelPackage = new System.Windows.Forms.Button();
             this.OutBoxLabelPrint = new System.Windows.Forms.Button();
             this.OutBoxLabelAutoPrint = new System.Windows.Forms.CheckBox();
             this.OutBoxCombox = new System.Windows.Forms.ComboBox();
@@ -1174,8 +1171,6 @@
             this.pr_unit,
             this.pib_lotno,
             this.pib_datecode,
-            this.pib_cusbarcode,
-            this.pib_cusoutboxcode,
             this.pib_datecode1,
             this.pib_qty,
             this.pib_barcode,
@@ -1300,20 +1295,6 @@
             this.pib_datecode.Name = "pib_datecode";
             this.pib_datecode.Width = 78;
             // 
-            // pib_cusbarcode
-            // 
-            this.pib_cusbarcode.DataPropertyName = "pib_cusbarcode";
-            this.pib_cusbarcode.HeaderText = "ViVo条码号";
-            this.pib_cusbarcode.Name = "pib_cusbarcode";
-            this.pib_cusbarcode.Width = 90;
-            // 
-            // pib_cusoutboxcode
-            // 
-            this.pib_cusoutboxcode.DataPropertyName = "pib_cusoutboxcode";
-            this.pib_cusoutboxcode.HeaderText = "ViVo外箱";
-            this.pib_cusoutboxcode.Name = "pib_cusoutboxcode";
-            this.pib_cusoutboxcode.Width = 78;
-            // 
             // pib_datecode1
             // 
             this.pib_datecode1.DataPropertyName = "pib_datecode1";
@@ -1611,7 +1592,6 @@
             this.OutBoxLabel.Controls.Add(this.label6);
             this.OutBoxLabel.Controls.Add(this.OutBoxPrinter);
             this.OutBoxLabel.Controls.Add(this.OutboxCapacity);
-            this.OutBoxLabel.Controls.Add(this.OutBoxLabelPackage);
             this.OutBoxLabel.Controls.Add(this.OutBoxLabelPrint);
             this.OutBoxLabel.Controls.Add(this.OutBoxLabelAutoPrint);
             this.OutBoxLabel.Controls.Add(this.OutBoxCombox);
@@ -1705,18 +1685,6 @@
             0});
             this.OutboxCapacity.Leave += new System.EventHandler(this.MidBoxCapacity_Leave);
             // 
-            // OutBoxLabelPackage
-            // 
-            this.OutBoxLabelPackage.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.OutBoxLabelPackage.Location = new System.Drawing.Point(89, 113);
-            this.OutBoxLabelPackage.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.OutBoxLabelPackage.Name = "OutBoxLabelPackage";
-            this.OutBoxLabelPackage.Size = new System.Drawing.Size(75, 26);
-            this.OutBoxLabelPackage.TabIndex = 81;
-            this.OutBoxLabelPackage.Text = "Vivo打印";
-            this.OutBoxLabelPackage.UseVisualStyleBackColor = true;
-            this.OutBoxLabelPackage.Click += new System.EventHandler(this.OutBoxLabelPackage_Click);
-            // 
             // OutBoxLabelPrint
             // 
             this.OutBoxLabelPrint.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
@@ -1856,7 +1824,6 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn15;
         private System.Windows.Forms.Label label6;
         private System.Windows.Forms.NumericUpDown OutboxCapacity;
-        private System.Windows.Forms.Button OutBoxLabelPackage;
         private System.Windows.Forms.CheckBox OutBoxLabelAutoPrint;
         private System.Windows.Forms.ComboBox MidLabelCombox;
         private System.Windows.Forms.CheckBox MidLabelAutoPrint;
@@ -1950,6 +1917,12 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn si_item;
         private System.Windows.Forms.DataGridViewTextBoxColumn si_expressionitem;
         private System.Windows.Forms.Label pi_date;
+        private System.Windows.Forms.Button CleanBarCode;
+        private System.Windows.Forms.ListBox ListButtonMenu;
+        private System.Windows.Forms.Button ButtonSetting;
+        private System.Windows.Forms.ContextMenuStrip contextMenuStrip1;
+        private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem1;
+        private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem2;
         private System.Windows.Forms.DataGridViewCheckBoxColumn Choose;
         private System.Windows.Forms.DataGridViewCheckBoxColumn pib_ifpick;
         private System.Windows.Forms.DataGridViewCheckBoxColumn pib_ifprint;
@@ -1963,8 +1936,6 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn pr_unit;
         private System.Windows.Forms.DataGridViewTextBoxColumn pib_lotno;
         private System.Windows.Forms.DataGridViewTextBoxColumn pib_datecode;
-        private System.Windows.Forms.DataGridViewTextBoxColumn pib_cusbarcode;
-        private System.Windows.Forms.DataGridViewTextBoxColumn pib_cusoutboxcode;
         private System.Windows.Forms.DataGridViewTextBoxColumn pib_datecode1;
         private System.Windows.Forms.DataGridViewTextBoxColumn pib_qty;
         private System.Windows.Forms.DataGridViewTextBoxColumn pib_barcode;
@@ -1975,11 +1946,5 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn pr_spec;
         private System.Windows.Forms.DataGridViewTextBoxColumn pib_outboxcode1;
         private System.Windows.Forms.DataGridViewTextBoxColumn pib_outboxcode2;
-        private System.Windows.Forms.Button CleanBarCode;
-        private System.Windows.Forms.ListBox ListButtonMenu;
-        private System.Windows.Forms.Button ButtonSetting;
-        private System.Windows.Forms.ContextMenuStrip contextMenuStrip1;
-        private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem1;
-        private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem2;
     }
 }

UAS-出货标签管理(吉利通)/UAS_出货标签管理.cs

@@ -215,13 +215,6 @@ namespace UAS_LabelMachine
                 MidLabelAutoPrint.Checked = true;
                 pib_madein.Visible = true;
             }
-            if (!(DataHelper.DBConnectionString.Contains("richwell") || DataHelper.DBConnectionString.Contains("192.168.0.88")))
-            {
-                pib_cusbarcode.Visible = false;
-                pib_cusoutboxcode.Visible = false;
-                OutBoxLabelPackage.Visible = false;
-                //GetOutBoxCode.Visible = false;
-            }
             asc.controllInitializeSize(this);
             asc.controlAutoSize(this);
             //实例化打印进程
@@ -2087,14 +2080,6 @@ namespace UAS_LabelMachine
             pr_code.Condition = "  pd_inoutno='" + pi_inoutno.Text + "'";
         }
 
-        private void OutBoxLabelPackage_Click(object sender, EventArgs e)
-        {
-            thread = new Thread(CusLabelPrint);
-            stw = new SetLoadingWindow(thread, "正在打印客户外箱号");
-            BaseUtil.SetFormCenter(stw);
-            stw.ShowDialog();
-        }
-
         private void CusLabelPrint()
         {
             //MaxOutBoxCode = MaxOutBoxCode + 1;
@@ -2568,7 +2553,7 @@ namespace UAS_LabelMachine
             switch (ListButtonMenu.SelectedItem.ToString())
             {
                 case "采集策略设置":
-                    采集策略 form = new 采集策略(sg_code.Text);
+                    采集策略_NEW form = new 采集策略_NEW();
                     form.FormClosed += sg_code_UserControlTextChanged;
                     BaseUtil.SetFormCenter(form);
                     form.ShowDialog();

UAS-出货标签管理(吉利通)/UAS_出货标签管理.resx

@@ -162,12 +162,6 @@
   <metadata name="pr_unit.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="pib_cusbarcode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="pib_cusoutboxcode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
   <metadata name="pib_datecode1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>

UAS-出货标签管理(吉利通)/采集策略.Designer.cs

@@ -659,7 +659,7 @@
             // 
             this.si_id4.Enabled = false;
             this.si_id4.ID = null;
-            this.si_id4.Location = new System.Drawing.Point(914, 174);
+            this.si_id4.Location = new System.Drawing.Point(914, 201);
             this.si_id4.Name = "si_id4";
             this.si_id4.Size = new System.Drawing.Size(157, 21);
             this.si_id4.Str = null;
@@ -824,7 +824,7 @@
             // 
             this.si_item4.Enabled = false;
             this.si_item4.ID = null;
-            this.si_item4.Location = new System.Drawing.Point(914, 131);
+            this.si_item4.Location = new System.Drawing.Point(914, 106);
             this.si_item4.Name = "si_item4";
             this.si_item4.Size = new System.Drawing.Size(157, 21);
             this.si_item4.Str = null;
@@ -862,7 +862,7 @@
             // 
             this.si_item3.Enabled = false;
             this.si_item3.ID = null;
-            this.si_item3.Location = new System.Drawing.Point(914, 446);
+            this.si_item3.Location = new System.Drawing.Point(914, 490);
             this.si_item3.Name = "si_item3";
             this.si_item3.Size = new System.Drawing.Size(157, 21);
             this.si_item3.Str = null;
@@ -900,7 +900,7 @@
             // 
             this.si_item2.Enabled = false;
             this.si_item2.ID = null;
-            this.si_item2.Location = new System.Drawing.Point(914, 230);
+            this.si_item2.Location = new System.Drawing.Point(914, 292);
             this.si_item2.Name = "si_item2";
             this.si_item2.Size = new System.Drawing.Size(157, 21);
             this.si_item2.Str = null;
@@ -938,7 +938,7 @@
             // 
             this.si_item1.Enabled = false;
             this.si_item1.ID = null;
-            this.si_item1.Location = new System.Drawing.Point(914, 335);
+            this.si_item1.Location = new System.Drawing.Point(913, 388);
             this.si_item1.Name = "si_item1";
             this.si_item1.Size = new System.Drawing.Size(157, 21);
             this.si_item1.Str = null;
@@ -1240,7 +1240,7 @@
             // 
             this.si_item5.Enabled = false;
             this.si_item5.ID = null;
-            this.si_item5.Location = new System.Drawing.Point(914, 554);
+            this.si_item5.Location = new System.Drawing.Point(913, 531);
             this.si_item5.Name = "si_item5";
             this.si_item5.Size = new System.Drawing.Size(157, 21);
             this.si_item5.Str = null;

UAS-出货标签管理(吉利通)/采集策略_NEW.Designer.cs

@@ -0,0 +1,597 @@
+namespace UAS_LabelMachine
+{
+    partial class 采集策略_NEW
+    {
+        /// <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()
+        {
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(采集策略_NEW));
+            this.si_item1 = new System.Windows.Forms.CheckBox();
+            this.si_item4 = new System.Windows.Forms.CheckBox();
+            this.si_item3 = new System.Windows.Forms.CheckBox();
+            this.si_item2 = new System.Windows.Forms.CheckBox();
+            this.si_item6 = new System.Windows.Forms.CheckBox();
+            this.si_item5 = new System.Windows.Forms.CheckBox();
+            this.si_name1 = new System.Windows.Forms.TextBox();
+            this.si_name6 = new System.Windows.Forms.TextBox();
+            this.si_name5 = new System.Windows.Forms.TextBox();
+            this.si_name4 = new System.Windows.Forms.TextBox();
+            this.si_name3 = new System.Windows.Forms.TextBox();
+            this.si_name2 = new System.Windows.Forms.TextBox();
+            this.OrderName_label = new System.Windows.Forms.Label();
+            this.PNName_label = new System.Windows.Forms.Label();
+            this.QTYName_label = new System.Windows.Forms.Label();
+            this.DateCodeName_label = new System.Windows.Forms.Label();
+            this.LotNoName_label = new System.Windows.Forms.Label();
+            this.OutBoxName_label = new System.Windows.Forms.Label();
+            this.OutBoxRemark_label = new System.Windows.Forms.Label();
+            this.LotNoRemark_label = new System.Windows.Forms.Label();
+            this.DateCodeRemark_label = new System.Windows.Forms.Label();
+            this.QTYRemark_label = new System.Windows.Forms.Label();
+            this.PNRemark_label = new System.Windows.Forms.Label();
+            this.OrderRemark_label = new System.Windows.Forms.Label();
+            this.si_remark2 = new System.Windows.Forms.TextBox();
+            this.si_remark3 = new System.Windows.Forms.TextBox();
+            this.si_remark4 = new System.Windows.Forms.TextBox();
+            this.si_remark5 = new System.Windows.Forms.TextBox();
+            this.si_remark6 = new System.Windows.Forms.TextBox();
+            this.si_remark1 = new System.Windows.Forms.TextBox();
+            this.label13 = new System.Windows.Forms.Label();
+            this.ScanGroupName_label = new System.Windows.Forms.Label();
+            this.PNScript_label = new System.Windows.Forms.Label();
+            this.DateCodeScript_label = new System.Windows.Forms.Label();
+            this.sg_name = new System.Windows.Forms.TextBox();
+            this.sg_step = new System.Windows.Forms.NumericUpDown();
+            this.ScanStep_label = new System.Windows.Forms.Label();
+            this.sg_autolabel = new System.Windows.Forms.CheckBox();
+            this.si_expression4 = new UAS_LabelMachine.CustomControl.RichText.RichTextAutoBottom();
+            this.si_expression3 = new UAS_LabelMachine.CustomControl.RichText.RichTextAutoBottom();
+            this.sg_script = new UAS_LabelMachine.CustomControl.RichText.RichTextAutoBottom();
+            this.CustomerTreeView = new System.Windows.Forms.TreeView();
+            this.ButtonSaveScanGroup = new UAS_LabelMachine.CustomControl.NormalButton();
+            ((System.ComponentModel.ISupportInitialize)(this.sg_step)).BeginInit();
+            this.SuspendLayout();
+            // 
+            // si_item1
+            // 
+            this.si_item1.AutoSize = true;
+            this.si_item1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.si_item1.Location = new System.Drawing.Point(300, 199);
+            this.si_item1.Name = "si_item1";
+            this.si_item1.Size = new System.Drawing.Size(125, 25);
+            this.si_item1.TabIndex = 1;
+            this.si_item1.Tag = "Order";
+            this.si_item1.Text = "包含采购订单";
+            this.si_item1.UseVisualStyleBackColor = true;
+            this.si_item1.CheckedChanged += new System.EventHandler(this.CheckChange);
+            // 
+            // si_item4
+            // 
+            this.si_item4.AutoSize = true;
+            this.si_item4.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.si_item4.Location = new System.Drawing.Point(299, 399);
+            this.si_item4.Name = "si_item4";
+            this.si_item4.Size = new System.Drawing.Size(137, 25);
+            this.si_item4.TabIndex = 2;
+            this.si_item4.Tag = "DateCode";
+            this.si_item4.Text = "包含DateCode";
+            this.si_item4.UseVisualStyleBackColor = true;
+            this.si_item4.CheckedChanged += new System.EventHandler(this.CheckChange);
+            // 
+            // si_item3
+            // 
+            this.si_item3.AutoSize = true;
+            this.si_item3.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.si_item3.Location = new System.Drawing.Point(299, 256);
+            this.si_item3.Name = "si_item3";
+            this.si_item3.Size = new System.Drawing.Size(93, 25);
+            this.si_item3.TabIndex = 3;
+            this.si_item3.Tag = "QTY";
+            this.si_item3.Text = "包含数量";
+            this.si_item3.UseVisualStyleBackColor = true;
+            this.si_item3.CheckedChanged += new System.EventHandler(this.CheckChange);
+            // 
+            // si_item2
+            // 
+            this.si_item2.AutoSize = true;
+            this.si_item2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.si_item2.Location = new System.Drawing.Point(300, 228);
+            this.si_item2.Name = "si_item2";
+            this.si_item2.Size = new System.Drawing.Size(93, 25);
+            this.si_item2.TabIndex = 4;
+            this.si_item2.Tag = "PN";
+            this.si_item2.Text = "包含型号";
+            this.si_item2.UseVisualStyleBackColor = true;
+            this.si_item2.CheckedChanged += new System.EventHandler(this.CheckChange);
+            // 
+            // si_item6
+            // 
+            this.si_item6.AutoSize = true;
+            this.si_item6.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.si_item6.Location = new System.Drawing.Point(300, 580);
+            this.si_item6.Name = "si_item6";
+            this.si_item6.Size = new System.Drawing.Size(93, 25);
+            this.si_item6.TabIndex = 5;
+            this.si_item6.Tag = "OutBox";
+            this.si_item6.Text = "包含箱号";
+            this.si_item6.UseVisualStyleBackColor = true;
+            this.si_item6.CheckedChanged += new System.EventHandler(this.CheckChange);
+            // 
+            // si_item5
+            // 
+            this.si_item5.AutoSize = true;
+            this.si_item5.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.si_item5.Location = new System.Drawing.Point(300, 549);
+            this.si_item5.Name = "si_item5";
+            this.si_item5.Size = new System.Drawing.Size(108, 25);
+            this.si_item5.TabIndex = 6;
+            this.si_item5.Tag = "LotNo";
+            this.si_item5.Text = "包含LotNo";
+            this.si_item5.UseVisualStyleBackColor = true;
+            this.si_item5.CheckedChanged += new System.EventHandler(this.CheckChange);
+            // 
+            // si_name1
+            // 
+            this.si_name1.Enabled = false;
+            this.si_name1.Location = new System.Drawing.Point(557, 199);
+            this.si_name1.Name = "si_name1";
+            this.si_name1.Size = new System.Drawing.Size(65, 21);
+            this.si_name1.TabIndex = 7;
+            // 
+            // si_name6
+            // 
+            this.si_name6.Enabled = false;
+            this.si_name6.Location = new System.Drawing.Point(557, 580);
+            this.si_name6.Name = "si_name6";
+            this.si_name6.Size = new System.Drawing.Size(65, 21);
+            this.si_name6.TabIndex = 8;
+            // 
+            // si_name5
+            // 
+            this.si_name5.Enabled = false;
+            this.si_name5.Location = new System.Drawing.Point(557, 549);
+            this.si_name5.Name = "si_name5";
+            this.si_name5.Size = new System.Drawing.Size(65, 21);
+            this.si_name5.TabIndex = 9;
+            // 
+            // si_name4
+            // 
+            this.si_name4.Enabled = false;
+            this.si_name4.Location = new System.Drawing.Point(557, 399);
+            this.si_name4.Name = "si_name4";
+            this.si_name4.Size = new System.Drawing.Size(65, 21);
+            this.si_name4.TabIndex = 10;
+            // 
+            // si_name3
+            // 
+            this.si_name3.Enabled = false;
+            this.si_name3.Location = new System.Drawing.Point(557, 256);
+            this.si_name3.Name = "si_name3";
+            this.si_name3.Size = new System.Drawing.Size(65, 21);
+            this.si_name3.TabIndex = 11;
+            // 
+            // si_name2
+            // 
+            this.si_name2.Enabled = false;
+            this.si_name2.Location = new System.Drawing.Point(557, 228);
+            this.si_name2.Name = "si_name2";
+            this.si_name2.Size = new System.Drawing.Size(65, 21);
+            this.si_name2.TabIndex = 12;
+            // 
+            // OrderName_label
+            // 
+            this.OrderName_label.AutoSize = true;
+            this.OrderName_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.OrderName_label.Location = new System.Drawing.Point(464, 199);
+            this.OrderName_label.Name = "OrderName_label";
+            this.OrderName_label.Size = new System.Drawing.Size(90, 21);
+            this.OrderName_label.TabIndex = 13;
+            this.OrderName_label.Text = "模式组名称";
+            // 
+            // PNName_label
+            // 
+            this.PNName_label.AutoSize = true;
+            this.PNName_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.PNName_label.Location = new System.Drawing.Point(464, 228);
+            this.PNName_label.Name = "PNName_label";
+            this.PNName_label.Size = new System.Drawing.Size(90, 21);
+            this.PNName_label.TabIndex = 14;
+            this.PNName_label.Text = "模式组名称";
+            // 
+            // QTYName_label
+            // 
+            this.QTYName_label.AutoSize = true;
+            this.QTYName_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.QTYName_label.Location = new System.Drawing.Point(463, 256);
+            this.QTYName_label.Name = "QTYName_label";
+            this.QTYName_label.Size = new System.Drawing.Size(90, 21);
+            this.QTYName_label.TabIndex = 15;
+            this.QTYName_label.Text = "模式组名称";
+            // 
+            // DateCodeName_label
+            // 
+            this.DateCodeName_label.AutoSize = true;
+            this.DateCodeName_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.DateCodeName_label.Location = new System.Drawing.Point(463, 399);
+            this.DateCodeName_label.Name = "DateCodeName_label";
+            this.DateCodeName_label.Size = new System.Drawing.Size(90, 21);
+            this.DateCodeName_label.TabIndex = 16;
+            this.DateCodeName_label.Text = "模式组名称";
+            // 
+            // LotNoName_label
+            // 
+            this.LotNoName_label.AutoSize = true;
+            this.LotNoName_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.LotNoName_label.Location = new System.Drawing.Point(464, 549);
+            this.LotNoName_label.Name = "LotNoName_label";
+            this.LotNoName_label.Size = new System.Drawing.Size(90, 21);
+            this.LotNoName_label.TabIndex = 17;
+            this.LotNoName_label.Text = "模式组名称";
+            // 
+            // OutBoxName_label
+            // 
+            this.OutBoxName_label.AutoSize = true;
+            this.OutBoxName_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.OutBoxName_label.Location = new System.Drawing.Point(464, 580);
+            this.OutBoxName_label.Name = "OutBoxName_label";
+            this.OutBoxName_label.Size = new System.Drawing.Size(90, 21);
+            this.OutBoxName_label.TabIndex = 18;
+            this.OutBoxName_label.Text = "模式组名称";
+            // 
+            // OutBoxRemark_label
+            // 
+            this.OutBoxRemark_label.AutoSize = true;
+            this.OutBoxRemark_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.OutBoxRemark_label.Location = new System.Drawing.Point(663, 580);
+            this.OutBoxRemark_label.Name = "OutBoxRemark_label";
+            this.OutBoxRemark_label.Size = new System.Drawing.Size(42, 21);
+            this.OutBoxRemark_label.TabIndex = 24;
+            this.OutBoxRemark_label.Text = "说明";
+            // 
+            // LotNoRemark_label
+            // 
+            this.LotNoRemark_label.AutoSize = true;
+            this.LotNoRemark_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.LotNoRemark_label.Location = new System.Drawing.Point(662, 549);
+            this.LotNoRemark_label.Name = "LotNoRemark_label";
+            this.LotNoRemark_label.Size = new System.Drawing.Size(42, 21);
+            this.LotNoRemark_label.TabIndex = 23;
+            this.LotNoRemark_label.Text = "说明";
+            // 
+            // DateCodeRemark_label
+            // 
+            this.DateCodeRemark_label.AutoSize = true;
+            this.DateCodeRemark_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.DateCodeRemark_label.Location = new System.Drawing.Point(661, 399);
+            this.DateCodeRemark_label.Name = "DateCodeRemark_label";
+            this.DateCodeRemark_label.Size = new System.Drawing.Size(42, 21);
+            this.DateCodeRemark_label.TabIndex = 22;
+            this.DateCodeRemark_label.Text = "说明";
+            // 
+            // QTYRemark_label
+            // 
+            this.QTYRemark_label.AutoSize = true;
+            this.QTYRemark_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.QTYRemark_label.Location = new System.Drawing.Point(661, 256);
+            this.QTYRemark_label.Name = "QTYRemark_label";
+            this.QTYRemark_label.Size = new System.Drawing.Size(42, 21);
+            this.QTYRemark_label.TabIndex = 21;
+            this.QTYRemark_label.Text = "说明";
+            // 
+            // PNRemark_label
+            // 
+            this.PNRemark_label.AutoSize = true;
+            this.PNRemark_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.PNRemark_label.Location = new System.Drawing.Point(662, 228);
+            this.PNRemark_label.Name = "PNRemark_label";
+            this.PNRemark_label.Size = new System.Drawing.Size(42, 21);
+            this.PNRemark_label.TabIndex = 20;
+            this.PNRemark_label.Text = "说明";
+            // 
+            // OrderRemark_label
+            // 
+            this.OrderRemark_label.AutoSize = true;
+            this.OrderRemark_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.OrderRemark_label.Location = new System.Drawing.Point(662, 198);
+            this.OrderRemark_label.Name = "OrderRemark_label";
+            this.OrderRemark_label.Size = new System.Drawing.Size(42, 21);
+            this.OrderRemark_label.TabIndex = 19;
+            this.OrderRemark_label.Text = "说明";
+            // 
+            // si_remark2
+            // 
+            this.si_remark2.Enabled = false;
+            this.si_remark2.Location = new System.Drawing.Point(710, 228);
+            this.si_remark2.Name = "si_remark2";
+            this.si_remark2.Size = new System.Drawing.Size(195, 21);
+            this.si_remark2.TabIndex = 30;
+            // 
+            // si_remark3
+            // 
+            this.si_remark3.Enabled = false;
+            this.si_remark3.Location = new System.Drawing.Point(710, 256);
+            this.si_remark3.Name = "si_remark3";
+            this.si_remark3.Size = new System.Drawing.Size(195, 21);
+            this.si_remark3.TabIndex = 29;
+            // 
+            // si_remark4
+            // 
+            this.si_remark4.Enabled = false;
+            this.si_remark4.Location = new System.Drawing.Point(710, 399);
+            this.si_remark4.Name = "si_remark4";
+            this.si_remark4.Size = new System.Drawing.Size(195, 21);
+            this.si_remark4.TabIndex = 28;
+            // 
+            // si_remark5
+            // 
+            this.si_remark5.Enabled = false;
+            this.si_remark5.Location = new System.Drawing.Point(710, 549);
+            this.si_remark5.Name = "si_remark5";
+            this.si_remark5.Size = new System.Drawing.Size(195, 21);
+            this.si_remark5.TabIndex = 27;
+            // 
+            // si_remark6
+            // 
+            this.si_remark6.Enabled = false;
+            this.si_remark6.Location = new System.Drawing.Point(710, 580);
+            this.si_remark6.Name = "si_remark6";
+            this.si_remark6.Size = new System.Drawing.Size(195, 21);
+            this.si_remark6.TabIndex = 26;
+            // 
+            // si_remark1
+            // 
+            this.si_remark1.Enabled = false;
+            this.si_remark1.Location = new System.Drawing.Point(710, 199);
+            this.si_remark1.Name = "si_remark1";
+            this.si_remark1.Size = new System.Drawing.Size(195, 21);
+            this.si_remark1.TabIndex = 25;
+            // 
+            // label13
+            // 
+            this.label13.AutoSize = true;
+            this.label13.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label13.Location = new System.Drawing.Point(307, 82);
+            this.label13.Name = "label13";
+            this.label13.Size = new System.Drawing.Size(74, 21);
+            this.label13.TabIndex = 32;
+            this.label13.Text = "匹配模式";
+            // 
+            // ScanGroupName_label
+            // 
+            this.ScanGroupName_label.AutoSize = true;
+            this.ScanGroupName_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.ScanGroupName_label.Location = new System.Drawing.Point(307, 49);
+            this.ScanGroupName_label.Name = "ScanGroupName_label";
+            this.ScanGroupName_label.Size = new System.Drawing.Size(74, 21);
+            this.ScanGroupName_label.TabIndex = 33;
+            this.ScanGroupName_label.Text = "策略名称";
+            // 
+            // PNScript_label
+            // 
+            this.PNScript_label.AutoSize = true;
+            this.PNScript_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.PNScript_label.Location = new System.Drawing.Point(464, 283);
+            this.PNScript_label.Name = "PNScript_label";
+            this.PNScript_label.Size = new System.Drawing.Size(42, 21);
+            this.PNScript_label.TabIndex = 35;
+            this.PNScript_label.Text = "脚本";
+            // 
+            // DateCodeScript_label
+            // 
+            this.DateCodeScript_label.AutoSize = true;
+            this.DateCodeScript_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.DateCodeScript_label.Location = new System.Drawing.Point(464, 431);
+            this.DateCodeScript_label.Name = "DateCodeScript_label";
+            this.DateCodeScript_label.Size = new System.Drawing.Size(42, 21);
+            this.DateCodeScript_label.TabIndex = 37;
+            this.DateCodeScript_label.Text = "脚本";
+            // 
+            // sg_name
+            // 
+            this.sg_name.Enabled = false;
+            this.sg_name.Location = new System.Drawing.Point(409, 49);
+            this.sg_name.Name = "sg_name";
+            this.sg_name.Size = new System.Drawing.Size(195, 21);
+            this.sg_name.TabIndex = 38;
+            // 
+            // sg_step
+            // 
+            this.sg_step.Location = new System.Drawing.Point(710, 50);
+            this.sg_step.Name = "sg_step";
+            this.sg_step.Size = new System.Drawing.Size(73, 21);
+            this.sg_step.TabIndex = 39;
+            // 
+            // ScanStep_label
+            // 
+            this.ScanStep_label.AutoSize = true;
+            this.ScanStep_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.ScanStep_label.Location = new System.Drawing.Point(629, 49);
+            this.ScanStep_label.Name = "ScanStep_label";
+            this.ScanStep_label.Size = new System.Drawing.Size(74, 21);
+            this.ScanStep_label.TabIndex = 40;
+            this.ScanStep_label.Text = "扫描步骤";
+            // 
+            // sg_autolabel
+            // 
+            this.sg_autolabel.AutoSize = true;
+            this.sg_autolabel.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.sg_autolabel.Location = new System.Drawing.Point(809, 48);
+            this.sg_autolabel.Name = "sg_autolabel";
+            this.sg_autolabel.Size = new System.Drawing.Size(141, 25);
+            this.sg_autolabel.TabIndex = 41;
+            this.sg_autolabel.Text = "自动贴标机标签";
+            this.sg_autolabel.UseVisualStyleBackColor = true;
+            // 
+            // si_expression4
+            // 
+            this.si_expression4.Enabled = false;
+            this.si_expression4.Location = new System.Drawing.Point(467, 457);
+            this.si_expression4.Name = "si_expression4";
+            this.si_expression4.Size = new System.Drawing.Size(438, 79);
+            this.si_expression4.TabIndex = 36;
+            this.si_expression4.Text = "";
+            // 
+            // si_expression3
+            // 
+            this.si_expression3.Enabled = false;
+            this.si_expression3.Location = new System.Drawing.Point(467, 309);
+            this.si_expression3.Name = "si_expression3";
+            this.si_expression3.Size = new System.Drawing.Size(438, 79);
+            this.si_expression3.TabIndex = 34;
+            this.si_expression3.Text = "";
+            // 
+            // sg_script
+            // 
+            this.sg_script.Location = new System.Drawing.Point(409, 82);
+            this.sg_script.Name = "sg_script";
+            this.sg_script.Size = new System.Drawing.Size(434, 96);
+            this.sg_script.TabIndex = 31;
+            this.sg_script.Text = "";
+            // 
+            // CustomerTreeView
+            // 
+            this.CustomerTreeView.Dock = System.Windows.Forms.DockStyle.Left;
+            this.CustomerTreeView.Location = new System.Drawing.Point(0, 0);
+            this.CustomerTreeView.Name = "CustomerTreeView";
+            this.CustomerTreeView.Size = new System.Drawing.Size(251, 634);
+            this.CustomerTreeView.TabIndex = 0;
+            this.CustomerTreeView.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.CustomerTreeView_NodeMouseClick);
+            // 
+            // ButtonSaveScanGroup
+            // 
+            this.ButtonSaveScanGroup.Image = ((System.Drawing.Image)(resources.GetObject("ButtonSaveScanGroup.Image")));
+            this.ButtonSaveScanGroup.Location = new System.Drawing.Point(254, 4);
+            this.ButtonSaveScanGroup.Name = "ButtonSaveScanGroup";
+            this.ButtonSaveScanGroup.Size = new System.Drawing.Size(64, 23);
+            this.ButtonSaveScanGroup.TabIndex = 42;
+            this.ButtonSaveScanGroup.Text = "保存";
+            this.ButtonSaveScanGroup.UseVisualStyleBackColor = true;
+            this.ButtonSaveScanGroup.Click += new System.EventHandler(this.ButtonSaveScanGroup_Click);
+            // 
+            // 采集策略_NEW
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(1082, 634);
+            this.Controls.Add(this.ButtonSaveScanGroup);
+            this.Controls.Add(this.sg_autolabel);
+            this.Controls.Add(this.ScanStep_label);
+            this.Controls.Add(this.sg_step);
+            this.Controls.Add(this.sg_name);
+            this.Controls.Add(this.DateCodeScript_label);
+            this.Controls.Add(this.si_expression4);
+            this.Controls.Add(this.PNScript_label);
+            this.Controls.Add(this.si_expression3);
+            this.Controls.Add(this.ScanGroupName_label);
+            this.Controls.Add(this.label13);
+            this.Controls.Add(this.sg_script);
+            this.Controls.Add(this.si_remark2);
+            this.Controls.Add(this.si_remark3);
+            this.Controls.Add(this.si_remark4);
+            this.Controls.Add(this.si_remark5);
+            this.Controls.Add(this.si_remark6);
+            this.Controls.Add(this.si_remark1);
+            this.Controls.Add(this.OutBoxRemark_label);
+            this.Controls.Add(this.LotNoRemark_label);
+            this.Controls.Add(this.DateCodeRemark_label);
+            this.Controls.Add(this.QTYRemark_label);
+            this.Controls.Add(this.PNRemark_label);
+            this.Controls.Add(this.OrderRemark_label);
+            this.Controls.Add(this.OutBoxName_label);
+            this.Controls.Add(this.LotNoName_label);
+            this.Controls.Add(this.DateCodeName_label);
+            this.Controls.Add(this.QTYName_label);
+            this.Controls.Add(this.PNName_label);
+            this.Controls.Add(this.OrderName_label);
+            this.Controls.Add(this.si_name2);
+            this.Controls.Add(this.si_name3);
+            this.Controls.Add(this.si_name4);
+            this.Controls.Add(this.si_name5);
+            this.Controls.Add(this.si_name6);
+            this.Controls.Add(this.si_name1);
+            this.Controls.Add(this.si_item5);
+            this.Controls.Add(this.si_item6);
+            this.Controls.Add(this.si_item2);
+            this.Controls.Add(this.si_item3);
+            this.Controls.Add(this.si_item4);
+            this.Controls.Add(this.si_item1);
+            this.Controls.Add(this.CustomerTreeView);
+            this.Name = "采集策略_NEW";
+            this.Text = "采集策略";
+            this.Load += new System.EventHandler(this.采集策略_Load);
+            this.SizeChanged += new System.EventHandler(this.采集策略_SizeChanged);
+            ((System.ComponentModel.ISupportInitialize)(this.sg_step)).EndInit();
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+        }
+
+        #endregion
+        private System.Windows.Forms.CheckBox si_item1;
+        private System.Windows.Forms.CheckBox si_item4;
+        private System.Windows.Forms.CheckBox si_item3;
+        private System.Windows.Forms.CheckBox si_item2;
+        private System.Windows.Forms.CheckBox si_item6;
+        private System.Windows.Forms.CheckBox si_item5;
+        private System.Windows.Forms.TextBox si_name1;
+        private System.Windows.Forms.TextBox si_name6;
+        private System.Windows.Forms.TextBox si_name5;
+        private System.Windows.Forms.TextBox si_name4;
+        private System.Windows.Forms.TextBox si_name3;
+        private System.Windows.Forms.TextBox si_name2;
+        private System.Windows.Forms.Label OrderName_label;
+        private System.Windows.Forms.Label PNName_label;
+        private System.Windows.Forms.Label QTYName_label;
+        private System.Windows.Forms.Label DateCodeName_label;
+        private System.Windows.Forms.Label LotNoName_label;
+        private System.Windows.Forms.Label OutBoxName_label;
+        private System.Windows.Forms.Label OutBoxRemark_label;
+        private System.Windows.Forms.Label LotNoRemark_label;
+        private System.Windows.Forms.Label DateCodeRemark_label;
+        private System.Windows.Forms.Label QTYRemark_label;
+        private System.Windows.Forms.Label PNRemark_label;
+        private System.Windows.Forms.Label OrderRemark_label;
+        private System.Windows.Forms.TextBox si_remark2;
+        private System.Windows.Forms.TextBox si_remark3;
+        private System.Windows.Forms.TextBox si_remark4;
+        private System.Windows.Forms.TextBox si_remark5;
+        private System.Windows.Forms.TextBox si_remark6;
+        private System.Windows.Forms.TextBox si_remark1;
+        private CustomControl.RichText.RichTextAutoBottom sg_script;
+        private System.Windows.Forms.Label label13;
+        private System.Windows.Forms.Label ScanGroupName_label;
+        private CustomControl.RichText.RichTextAutoBottom si_expression3;
+        private System.Windows.Forms.Label PNScript_label;
+        private System.Windows.Forms.Label DateCodeScript_label;
+        private CustomControl.RichText.RichTextAutoBottom si_expression4;
+        private System.Windows.Forms.TextBox sg_name;
+        private System.Windows.Forms.NumericUpDown sg_step;
+        private System.Windows.Forms.Label ScanStep_label;
+        private System.Windows.Forms.CheckBox sg_autolabel;
+        private System.Windows.Forms.TreeView CustomerTreeView;
+        private CustomControl.NormalButton ButtonSaveScanGroup;
+    }
+}

UAS-出货标签管理(吉利通)/采集策略_NEW.cs

@@ -0,0 +1,220 @@
+using System;
+using System.Data;
+using System.Text;
+using System.Windows.Forms;
+using UAS_LabelMachine.Entity;
+using UAS_LabelMachine.PublicMethod;
+
+namespace UAS_LabelMachine
+{
+    public partial class 采集策略_NEW : Form
+    {
+
+        AutoSizeFormClass asc = new AutoSizeFormClass();
+
+        DataHelper dh;
+
+        StringBuilder sql = new StringBuilder();
+
+        DataTable dt;
+
+        public 采集策略_NEW()
+        {
+            InitializeComponent();
+        }
+
+        private void 采集策略_Load(object sender, EventArgs e)
+        {
+            asc.controllInitializeSize(this);
+            dh = SystemInf.dh;
+            dt = (DataTable)dh.ExecuteSql("select pb_name from productbrand", "select");
+            for (int i = 0; i < dt.Rows.Count; i++)
+            {
+                CustomerTreeView.Nodes.Add(dt.Rows[i]["pb_name"].ToString());
+            }
+        }
+
+        private void 采集策略_SizeChanged(object sender, EventArgs e)
+        {
+            asc.controlAutoSize(this);
+        }
+
+        string SGID = "0";
+        string SGBrand = "";
+
+        private void CustomerTreeView_NodeMouseClick(object sender, TreeNodeMouseClickEventArgs e)
+        {
+            //点中根节点的时候查询品牌下的采集方案
+            if (e.Node.Level == 0)
+            {
+                dt = (DataTable)dh.ExecuteSql("select sg_id,sg_name from scangroup where sg_brand='" + e.Node.Text + "'", "select");
+                for (int i = 0; i < dt.Rows.Count; i++)
+                {
+                    //不重复添加编号
+                    bool Add = true;
+                    for (int j = 0; j < e.Node.Nodes.Count; j++)
+                    {
+                        if (e.Node.Nodes[j].Text == dt.Rows[i]["sg_name"].ToString())
+                        {
+                            Add = false;
+                            break;
+                        }
+                    }
+                    //添加节点Tag记录主表ID
+                    if (Add)
+                    {
+                        TreeNode tn = new TreeNode(dt.Rows[i]["sg_name"].ToString());
+                        tn.Tag = dt.Rows[i]["sg_id"].ToString();
+                        e.Node.Nodes.Add(tn);
+                    }
+                }
+                SGBrand = e.Node.Text;
+                SGID = "0";
+                CleanFormData();
+            }
+            //节点为子节点的时候查询界面的值
+            if (e.Node.Level == 1)
+            {
+                SGID = e.Node.Tag.ToString();
+                dt = (DataTable)dh.ExecuteSql("select sg_name,sg_script,sg_step,sg_autolabel from scangroup where sg_id=" + SGID, "select");
+                if (dt.Rows.Count > 0)
+                {
+                    sg_name.Text = dt.Rows[0]["sg_name"].ToString();
+                    sg_script.Text = dt.Rows[0]["sg_script"].ToString();
+                    sg_step.Text = dt.Rows[0]["sg_step"].ToString();
+                    sg_autolabel.Checked = dt.Rows[0]["sg_name"].ToString() == "0" ? false : true;
+                }
+                dt = (DataTable)dh.ExecuteSql("select si_item,si_expression,si_remark,si_name,si_enable from scanitem where si_sgid=" + SGID + "order by si_id", "select");
+                if (dt.Rows.Count > 0)
+                {
+                    for (int i = 0; i < 6; i++)
+                    {
+                        (Controls["si_item" + (i + 1)] as CheckBox).Checked = dt.Rows[i]["si_enable"].ToString() == "-1" ? true : false;
+                        Controls["si_name" + (i + 1)].Text = dt.Rows[i]["si_name"].ToString();
+                        Controls["si_remark" + (i + 1)].Text = dt.Rows[i]["si_remark"].ToString();
+                        if (Controls["si_expression" + (i + 1)] != null)
+                            Controls["si_expression" + (i + 1)].Text = dt.Rows[i]["si_expression"].ToString();
+                    }
+                }
+            }
+        }
+
+        private void ButtonSaveScanGroup_Click(object sender, EventArgs e)
+        {
+            string[] si_item = new string[6];
+            string[] si_name = new string[6];
+            string[] si_remark = new string[6];
+            string[] si_expression = new string[6];
+            string[] si_enable = new string[6];
+            //用数组的方式记录批量插入
+            string sgname = "";
+            for (int i = 0; i < 6; i++)
+            {
+                si_enable[i] = (Controls["si_item" + (i + 1)] as CheckBox).Checked ? "-1" : "0";
+                //如果是-1则拼接名称
+                if (si_enable[i] == "-1")
+                {
+                    sgname += Controls["si_name" + (i + 1)].Text.ToString() + "+";
+                }
+                si_item[i] = Controls["si_item" + (i + 1)].Tag.ToString();
+                si_name[i] = Controls["si_name" + (i + 1)].Text;
+                si_remark[i] = Controls["si_remark" + (i + 1)].Text;
+                if (Controls["si_expression" + (i + 1)] != null)
+                    si_expression[i] = Controls["si_expression" + (i + 1)].Text;
+                else
+                    si_expression[i] = "";
+            }
+            try
+            {
+                sgname = sgname.Substring(0, sgname.LastIndexOf("+"));
+            }
+            catch (Exception)
+            {
+
+            }
+            if (SGID == "0")
+            {
+                if (!dh.CheckExist("scangroup", "sg_name='" + sgname + "' and sg_brand='" + SGBrand + "'"))
+                {
+                    SGID = dh.GetSEQ("scangroup_seq");
+                    dh.ExecuteSql("insert into scangroup(sg_id,sg_brand)values(" + SGID + ",'" + SGBrand + "')", "insert");
+                }
+                else
+                {
+                    SGID = dh.getFieldDataByCondition("scangroup", "sg_id", "sg_name='" + sgname + "' and sg_brand='" + SGBrand + "'").ToString();
+                }
+            }
+            //每次保存的时候明细删除重新插入
+            dh.ExecuteSql("delete from scanitem where si_sgid=" + SGID, "delete");
+            //更新主表数据
+            sql.Clear();
+            sql.Append("update scangroup set sg_name=:sg_name,sg_script=:sg_script,sg_step=:sg_step,sg_autolabel=:sg_autolabel where sg_id=" + SGID);
+            dh.ExecuteSql(sql.ToString(), "update", sgname, sg_script.Text, sg_step.Value, sg_autolabel.Checked ? "-1" : "0");
+            sql.Clear();
+            sql.Append("insert into scanitem(si_id,si_sgid,si_item,si_expression,si_remark,si_name,");
+            sql.Append("si_enable) values(scanitem_seq.nextval,'" + SGID + "',:si_item,:si_expression,:si_remark,:si_name,:si_enable)");
+            dh.BatchInsert(sql.ToString(), new string[] { "si_item", "si_expression", "si_remark", "si_name", "si_enable" }, si_item, si_expression, si_remark, si_name, si_enable);
+            MessageBox.Show("保存成功!", "提示");
+        }
+
+        private void CheckChange(object sender, EventArgs e)
+        {
+            CheckBox cb = (CheckBox)sender;
+            int index = 0;
+            switch (cb.Tag.ToString())
+            {
+                case "Order":
+                    index = 1;
+                    break;
+                case "PN":
+                    index = 2;
+                    break;
+                case "QTY":
+                    index = 3;
+                    break;
+                case "DateCode":
+                    index = 4;
+                    break;
+                case "LotNo":
+                    index = 5;
+                    break;
+                case "OutBox":
+                    index = 6;
+                    break;
+                default:
+                    break;
+            }
+            if (cb.Checked)
+            {
+                Controls["si_name" + index].Enabled = true;
+                Controls["si_remark" + index].Enabled = true;
+                if (Controls["si_expression" + index] != null)
+                    Controls["si_expression" + index].Enabled = true;
+            }
+            else
+            {
+
+                Controls["si_name" + index].Enabled = false;
+                Controls["si_remark" + index].Enabled = false;
+                if (Controls["si_expression" + index] != null)
+                    Controls["si_expression" + index].Enabled = false;
+            }
+        }
+
+        private void CleanFormData()
+        {
+            sg_name.Text = "";
+            sg_script.Text = "";
+            sg_step.Value = 0;
+            sg_autolabel.Checked = false;
+            for (int i = 0; i < 6; i++)
+            {
+                (Controls["si_item" + (i + 1)] as CheckBox).Checked = false;
+                Controls["si_name" + (i + 1)].Text = "";
+                Controls["si_remark" + (i + 1)].Text = "";
+                if (Controls["si_expression" + (i + 1)] != null)
+                    Controls["si_expression" + (i + 1)].Text = "";
+            }
+        }
+    }
+}

UAS-出货标签管理(吉利通)/采集策略_NEW.resx

@@ -0,0 +1,133 @@
+<?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>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="ButtonSaveScanGroup.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        R0lGODlhUgAXAIQAAK/G1qjB1dzn6bTK2MfZ46rE1arD1/D4+/n//d/o7/X6/ez1/K7D1tLj6+Pt9ubx
+        877S3fT09DxZeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH/C05FVFNDQVBF
+        Mi4wAwEBAAAh+QQAAAAAACwAAAAAUgAXAAAI/wAlCBxIsKDBgwgTKlzIsGCEhxAjSpxIsaLFixgzPhQY
+        AYHHjyBDihxJsqTJkygjcFTAsqXLlzBjypxJs6ZNlRIiHNjJs6fPn0CDCh1KtCjOCAuSKl3KtKnTp1Cj
+        Sp169IHVq1izat3KtavXr2Crgh1LtqzZrUcdqF3Ltq3bt3Djyp1L92iCu3jz6t3Lt6/fv4ADHxVAuLDh
+        w4gTK17MuLHjow0iS55MubLly5gza958lIHnz6BDix5NurTp06iPGljNurXr17Bjy55Nu/bRALhz697N
+        u7fv38CDCz9aoLjx48iTK1/OvLnz50cBSJ9Ovbr169iza9/O/eiA7+DDi0EfT768+fPo0x+FwL69+/fw
+        48ufT7++/fX28+vfzz/+UQIABijggAQWaOCBCCao4FEaNejggxBG1NCEFFZoIUIBAQA7
+</value>
+  </data>
+</root>