修改盒号生成问题

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

@@ -12,9 +12,9 @@ namespace UAS_LabelMachine
     {
 
         //吉利通外网地址
-        private readonly string ConnectionStrings = "Connection Timeout=0;Pooling=false;Password=select!#%*(;User ID=T_DATACENTER;Pooling=false;Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=113.116.74.6)(PORT=1522)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=orcl)));";
+        private readonly string ConnectionStrings = "Connection Timeout=0;Pooling=false;Password=select!#%*(;User ID=T_DATACENTER;Pooling=false;Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=www.jeelyton.net)(PORT=1522)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=orcl)));";
         //吉利通ERP地址
-        public static readonly string ERPAddesss = "http://113.116.74.6:8099/ERP/";
+        public static readonly string ERPAddesss = "http://www.jeelyton.net:8099/ERP/";
         //吉利通FTP
         public static readonly string FTPAdress = "ftp://218.18.115.198:21|Print|Administrator1@#";
         //Oracle端口

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

@@ -1901,7 +1901,7 @@ namespace UAS_LabelMachine
 
         private void RefreshDBConnect_Tick(object sender, EventArgs e)
         {
-            dh.getRowCount("employee", "1=1");
+          
         }
 
         private void ButtonSetting_Click(object sender, EventArgs e)
@@ -2371,23 +2371,30 @@ namespace UAS_LabelMachine
             int outboxcode1 = int.Parse(Process_midboxcode.Text == "" ? "1" : Process_midboxcode.Text);
             int outboxcode2 = int.Parse(Process_outboxcode.Text == "" ? "1" : Process_outboxcode.Text);
             string pd_id = LabelInf.Rows[CurrentRowIndex].Cells["pd_id"].Value.ToString();
+            //获取上一行的数据
+            DataTable LastRowData = null;
             //如果满容量获取过箱号就不再重复获取了
             bool GetBarcode = false;
+            //获取当前的行号
+            int CurrentRowNum = int.Parse(LabelInf.Rows[CurrentRowIndex].Cells["rownum"].Value.ToString());
             //超过中盒容量中盒号+1
             if (adh.getRowCount("prodiobarcode", "pib_inoutno='" + pi_inoutno.Text + "' and pib_outboxcode1=" + outboxcode1) >= MidBoxCapacity.Value)
             {
                 outboxcode1 = outboxcode1 + 1;
                 GetBarcode = true;
                 LogicHandler.GetBarCode(PI_ID, pd_id, 1, out MidBoxBarCode);
+                LabelInf.Rows[CurrentRowIndex].Cells["pib_custmidboxcode"].Value = MidBoxBarCode;
                 LogicHandler.SendDataToPLC(PLC1, PLCInstruct.MaterialTray, adh);
             }
-            //获取当前的行号
-            int CurrentRowNum = int.Parse(LabelInf.Rows[CurrentRowIndex].Cells["rownum"].Value.ToString());
-            //获取上一行的数据
-            DataTable LastRowData = null;
-            if (CurrentRowNum - 1 > 0)
+            else if (CurrentRowNum - 1 > 0)
             {
                 LastRowData = (DataTable)adh.ExecuteSql("select pib_lotno,pib_custmidboxcode,pib_custoutboxcode,pd_pocode,pd_custprodcode,pd_custprodspec,pib_datecode from prodiobarcode where pib_inoutno='" + pi_inoutno.Text + "' and rownum=" + (CurrentRowNum - 1), "select");
+                string custmidboxcode = LastRowData.Rows[0]["pib_custmidboxcode"].ToString();
+                if (custmidboxcode == "")
+                {
+                    LogicHandler.GetBarCode(PI_ID, pd_id, 1, out MidBoxBarCode);
+                    LabelInf.Rows[CurrentRowIndex].Cells["pib_custmidboxcode"].Value = MidBoxBarCode;
+                }
                 //或者不符合合并条件中盒号+1
                 if (cu_print_midlotno.Checked)
                 {
@@ -2464,6 +2471,13 @@ namespace UAS_LabelMachine
             }
             else if (CurrentRowNum - 1 > 0)
             {
+                LastRowData = (DataTable)adh.ExecuteSql("select pib_lotno,pib_custmidboxcode,pib_custoutboxcode,pd_pocode,pd_custprodcode,pd_custprodspec,pib_datecode from prodiobarcode where pib_inoutno='" + pi_inoutno.Text + "' and rownum=" + (CurrentRowNum - 1), "select");
+                string custoutboxcode = LastRowData.Rows[0]["pib_custoutboxcode"].ToString();
+                if (custoutboxcode == "")
+                {
+                    LogicHandler.GetBarCode(PI_ID, pd_id, 1, out OutBoxBarCode);
+                    LabelInf.Rows[CurrentRowIndex].Cells["pib_custoutboxcode"].Value = OutBoxBarCode;
+                }
                 //或者不符合合并条件中盒号+1
                 if (cu_print_outlotno.Checked)
                 {

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

@@ -76,15 +76,15 @@
             this.sg_script = new System.Windows.Forms.RichTextBox();
             this.AddNew = 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(600, 398);
-            this.si_item1.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
+            this.si_item1.Location = new System.Drawing.Point(300, 199);
             this.si_item1.Name = "si_item1";
-            this.si_item1.Size = new System.Drawing.Size(242, 45);
+            this.si_item1.Size = new System.Drawing.Size(125, 25);
             this.si_item1.TabIndex = 1;
             this.si_item1.Tag = "Order";
             this.si_item1.Text = "包含采购订单";
@@ -95,10 +95,9 @@
             // 
             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(598, 798);
-            this.si_item4.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
+            this.si_item4.Location = new System.Drawing.Point(299, 399);
             this.si_item4.Name = "si_item4";
-            this.si_item4.Size = new System.Drawing.Size(265, 45);
+            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";
@@ -109,10 +108,9 @@
             // 
             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(598, 512);
-            this.si_item3.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
+            this.si_item3.Location = new System.Drawing.Point(299, 256);
             this.si_item3.Name = "si_item3";
-            this.si_item3.Size = new System.Drawing.Size(178, 45);
+            this.si_item3.Size = new System.Drawing.Size(93, 25);
             this.si_item3.TabIndex = 3;
             this.si_item3.Tag = "QTY";
             this.si_item3.Text = "包含数量";
@@ -123,10 +121,9 @@
             // 
             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(600, 456);
-            this.si_item2.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
+            this.si_item2.Location = new System.Drawing.Point(300, 228);
             this.si_item2.Name = "si_item2";
-            this.si_item2.Size = new System.Drawing.Size(178, 45);
+            this.si_item2.Size = new System.Drawing.Size(93, 25);
             this.si_item2.TabIndex = 4;
             this.si_item2.Tag = "PN";
             this.si_item2.Text = "包含型号";
@@ -137,10 +134,9 @@
             // 
             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(600, 1160);
-            this.si_item6.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
+            this.si_item6.Location = new System.Drawing.Point(300, 580);
             this.si_item6.Name = "si_item6";
-            this.si_item6.Size = new System.Drawing.Size(178, 45);
+            this.si_item6.Size = new System.Drawing.Size(93, 25);
             this.si_item6.TabIndex = 5;
             this.si_item6.Tag = "OutBox";
             this.si_item6.Text = "包含箱号";
@@ -151,10 +147,9 @@
             // 
             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(600, 1098);
-            this.si_item5.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
+            this.si_item5.Location = new System.Drawing.Point(300, 549);
             this.si_item5.Name = "si_item5";
-            this.si_item5.Size = new System.Drawing.Size(208, 45);
+            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";
@@ -164,60 +159,54 @@
             // si_name1
             // 
             this.si_name1.Enabled = false;
-            this.si_name1.Location = new System.Drawing.Point(1114, 398);
-            this.si_name1.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
+            this.si_name1.Location = new System.Drawing.Point(557, 199);
             this.si_name1.Name = "si_name1";
-            this.si_name1.Size = new System.Drawing.Size(126, 35);
+            this.si_name1.Size = new System.Drawing.Size(65, 21);
             this.si_name1.TabIndex = 7;
             this.si_name1.Tag = "Order";
             // 
             // si_name6
             // 
             this.si_name6.Enabled = false;
-            this.si_name6.Location = new System.Drawing.Point(1114, 1160);
-            this.si_name6.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
+            this.si_name6.Location = new System.Drawing.Point(557, 580);
             this.si_name6.Name = "si_name6";
-            this.si_name6.Size = new System.Drawing.Size(126, 35);
+            this.si_name6.Size = new System.Drawing.Size(65, 21);
             this.si_name6.TabIndex = 8;
             this.si_name6.Tag = "OutBox";
             // 
             // si_name5
             // 
             this.si_name5.Enabled = false;
-            this.si_name5.Location = new System.Drawing.Point(1114, 1098);
-            this.si_name5.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
+            this.si_name5.Location = new System.Drawing.Point(557, 549);
             this.si_name5.Name = "si_name5";
-            this.si_name5.Size = new System.Drawing.Size(126, 35);
+            this.si_name5.Size = new System.Drawing.Size(65, 21);
             this.si_name5.TabIndex = 9;
             this.si_name5.Tag = "LotNo";
             // 
             // si_name4
             // 
             this.si_name4.Enabled = false;
-            this.si_name4.Location = new System.Drawing.Point(1114, 798);
-            this.si_name4.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
+            this.si_name4.Location = new System.Drawing.Point(557, 399);
             this.si_name4.Name = "si_name4";
-            this.si_name4.Size = new System.Drawing.Size(126, 35);
+            this.si_name4.Size = new System.Drawing.Size(65, 21);
             this.si_name4.TabIndex = 10;
             this.si_name4.Tag = "DateCode";
             // 
             // si_name3
             // 
             this.si_name3.Enabled = false;
-            this.si_name3.Location = new System.Drawing.Point(1114, 512);
-            this.si_name3.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
+            this.si_name3.Location = new System.Drawing.Point(557, 256);
             this.si_name3.Name = "si_name3";
-            this.si_name3.Size = new System.Drawing.Size(126, 35);
+            this.si_name3.Size = new System.Drawing.Size(65, 21);
             this.si_name3.TabIndex = 11;
             this.si_name3.Tag = "QTY";
             // 
             // si_name2
             // 
             this.si_name2.Enabled = false;
-            this.si_name2.Location = new System.Drawing.Point(1114, 456);
-            this.si_name2.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
+            this.si_name2.Location = new System.Drawing.Point(557, 228);
             this.si_name2.Name = "si_name2";
-            this.si_name2.Size = new System.Drawing.Size(126, 35);
+            this.si_name2.Size = new System.Drawing.Size(65, 21);
             this.si_name2.TabIndex = 12;
             this.si_name2.Tag = "PN";
             // 
@@ -225,10 +214,9 @@
             // 
             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(928, 398);
-            this.OrderName_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+            this.OrderName_label.Location = new System.Drawing.Point(464, 199);
             this.OrderName_label.Name = "OrderName_label";
-            this.OrderName_label.Size = new System.Drawing.Size(178, 41);
+            this.OrderName_label.Size = new System.Drawing.Size(90, 21);
             this.OrderName_label.TabIndex = 13;
             this.OrderName_label.Text = "模式组名称";
             // 
@@ -236,10 +224,9 @@
             // 
             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(928, 456);
-            this.PNName_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+            this.PNName_label.Location = new System.Drawing.Point(464, 228);
             this.PNName_label.Name = "PNName_label";
-            this.PNName_label.Size = new System.Drawing.Size(178, 41);
+            this.PNName_label.Size = new System.Drawing.Size(90, 21);
             this.PNName_label.TabIndex = 14;
             this.PNName_label.Text = "模式组名称";
             // 
@@ -247,10 +234,9 @@
             // 
             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(926, 512);
-            this.QTYName_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+            this.QTYName_label.Location = new System.Drawing.Point(463, 256);
             this.QTYName_label.Name = "QTYName_label";
-            this.QTYName_label.Size = new System.Drawing.Size(178, 41);
+            this.QTYName_label.Size = new System.Drawing.Size(90, 21);
             this.QTYName_label.TabIndex = 15;
             this.QTYName_label.Text = "模式组名称";
             // 
@@ -258,10 +244,9 @@
             // 
             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(926, 798);
-            this.DateCodeName_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+            this.DateCodeName_label.Location = new System.Drawing.Point(463, 399);
             this.DateCodeName_label.Name = "DateCodeName_label";
-            this.DateCodeName_label.Size = new System.Drawing.Size(178, 41);
+            this.DateCodeName_label.Size = new System.Drawing.Size(90, 21);
             this.DateCodeName_label.TabIndex = 16;
             this.DateCodeName_label.Text = "模式组名称";
             // 
@@ -269,10 +254,9 @@
             // 
             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(928, 1098);
-            this.LotNoName_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+            this.LotNoName_label.Location = new System.Drawing.Point(464, 549);
             this.LotNoName_label.Name = "LotNoName_label";
-            this.LotNoName_label.Size = new System.Drawing.Size(178, 41);
+            this.LotNoName_label.Size = new System.Drawing.Size(90, 21);
             this.LotNoName_label.TabIndex = 17;
             this.LotNoName_label.Text = "模式组名称";
             // 
@@ -280,10 +264,9 @@
             // 
             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(928, 1160);
-            this.OutBoxName_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+            this.OutBoxName_label.Location = new System.Drawing.Point(464, 580);
             this.OutBoxName_label.Name = "OutBoxName_label";
-            this.OutBoxName_label.Size = new System.Drawing.Size(178, 41);
+            this.OutBoxName_label.Size = new System.Drawing.Size(90, 21);
             this.OutBoxName_label.TabIndex = 18;
             this.OutBoxName_label.Text = "模式组名称";
             // 
@@ -291,10 +274,9 @@
             // 
             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(1326, 1160);
-            this.OutBoxRemark_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+            this.OutBoxRemark_label.Location = new System.Drawing.Point(663, 580);
             this.OutBoxRemark_label.Name = "OutBoxRemark_label";
-            this.OutBoxRemark_label.Size = new System.Drawing.Size(82, 41);
+            this.OutBoxRemark_label.Size = new System.Drawing.Size(42, 21);
             this.OutBoxRemark_label.TabIndex = 24;
             this.OutBoxRemark_label.Text = "说明";
             // 
@@ -302,10 +284,9 @@
             // 
             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(1324, 1098);
-            this.LotNoRemark_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+            this.LotNoRemark_label.Location = new System.Drawing.Point(662, 549);
             this.LotNoRemark_label.Name = "LotNoRemark_label";
-            this.LotNoRemark_label.Size = new System.Drawing.Size(82, 41);
+            this.LotNoRemark_label.Size = new System.Drawing.Size(42, 21);
             this.LotNoRemark_label.TabIndex = 23;
             this.LotNoRemark_label.Text = "说明";
             // 
@@ -313,10 +294,9 @@
             // 
             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(1322, 798);
-            this.DateCodeRemark_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+            this.DateCodeRemark_label.Location = new System.Drawing.Point(661, 399);
             this.DateCodeRemark_label.Name = "DateCodeRemark_label";
-            this.DateCodeRemark_label.Size = new System.Drawing.Size(82, 41);
+            this.DateCodeRemark_label.Size = new System.Drawing.Size(42, 21);
             this.DateCodeRemark_label.TabIndex = 22;
             this.DateCodeRemark_label.Text = "说明";
             // 
@@ -324,10 +304,9 @@
             // 
             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(1322, 512);
-            this.QTYRemark_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+            this.QTYRemark_label.Location = new System.Drawing.Point(661, 256);
             this.QTYRemark_label.Name = "QTYRemark_label";
-            this.QTYRemark_label.Size = new System.Drawing.Size(82, 41);
+            this.QTYRemark_label.Size = new System.Drawing.Size(42, 21);
             this.QTYRemark_label.TabIndex = 21;
             this.QTYRemark_label.Text = "说明";
             // 
@@ -335,10 +314,9 @@
             // 
             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(1324, 456);
-            this.PNRemark_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+            this.PNRemark_label.Location = new System.Drawing.Point(662, 228);
             this.PNRemark_label.Name = "PNRemark_label";
-            this.PNRemark_label.Size = new System.Drawing.Size(82, 41);
+            this.PNRemark_label.Size = new System.Drawing.Size(42, 21);
             this.PNRemark_label.TabIndex = 20;
             this.PNRemark_label.Text = "说明";
             // 
@@ -346,70 +324,63 @@
             // 
             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(1324, 396);
-            this.OrderRemark_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+            this.OrderRemark_label.Location = new System.Drawing.Point(662, 198);
             this.OrderRemark_label.Name = "OrderRemark_label";
-            this.OrderRemark_label.Size = new System.Drawing.Size(82, 41);
+            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(1420, 456);
-            this.si_remark2.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
+            this.si_remark2.Location = new System.Drawing.Point(710, 228);
             this.si_remark2.Name = "si_remark2";
-            this.si_remark2.Size = new System.Drawing.Size(386, 35);
+            this.si_remark2.Size = new System.Drawing.Size(195, 21);
             this.si_remark2.TabIndex = 30;
             this.si_remark2.Tag = "PN";
             // 
             // si_remark3
             // 
             this.si_remark3.Enabled = false;
-            this.si_remark3.Location = new System.Drawing.Point(1420, 512);
-            this.si_remark3.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
+            this.si_remark3.Location = new System.Drawing.Point(710, 256);
             this.si_remark3.Name = "si_remark3";
-            this.si_remark3.Size = new System.Drawing.Size(386, 35);
+            this.si_remark3.Size = new System.Drawing.Size(195, 21);
             this.si_remark3.TabIndex = 29;
             this.si_remark3.Tag = "QTY";
             // 
             // si_remark4
             // 
             this.si_remark4.Enabled = false;
-            this.si_remark4.Location = new System.Drawing.Point(1420, 798);
-            this.si_remark4.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
+            this.si_remark4.Location = new System.Drawing.Point(710, 399);
             this.si_remark4.Name = "si_remark4";
-            this.si_remark4.Size = new System.Drawing.Size(386, 35);
+            this.si_remark4.Size = new System.Drawing.Size(195, 21);
             this.si_remark4.TabIndex = 28;
             this.si_remark4.Tag = "DateCode";
             // 
             // si_remark5
             // 
             this.si_remark5.Enabled = false;
-            this.si_remark5.Location = new System.Drawing.Point(1420, 1098);
-            this.si_remark5.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
+            this.si_remark5.Location = new System.Drawing.Point(710, 549);
             this.si_remark5.Name = "si_remark5";
-            this.si_remark5.Size = new System.Drawing.Size(386, 35);
+            this.si_remark5.Size = new System.Drawing.Size(195, 21);
             this.si_remark5.TabIndex = 27;
             this.si_remark5.Tag = "LotNo";
             // 
             // si_remark6
             // 
             this.si_remark6.Enabled = false;
-            this.si_remark6.Location = new System.Drawing.Point(1420, 1160);
-            this.si_remark6.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
+            this.si_remark6.Location = new System.Drawing.Point(710, 580);
             this.si_remark6.Name = "si_remark6";
-            this.si_remark6.Size = new System.Drawing.Size(386, 35);
+            this.si_remark6.Size = new System.Drawing.Size(195, 21);
             this.si_remark6.TabIndex = 26;
             this.si_remark6.Tag = "OutBox";
             // 
             // si_remark1
             // 
             this.si_remark1.Enabled = false;
-            this.si_remark1.Location = new System.Drawing.Point(1420, 398);
-            this.si_remark1.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
+            this.si_remark1.Location = new System.Drawing.Point(710, 199);
             this.si_remark1.Name = "si_remark1";
-            this.si_remark1.Size = new System.Drawing.Size(386, 35);
+            this.si_remark1.Size = new System.Drawing.Size(195, 21);
             this.si_remark1.TabIndex = 25;
             this.si_remark1.Tag = "Order";
             // 
@@ -417,10 +388,9 @@
             // 
             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(614, 164);
-            this.label13.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+            this.label13.Location = new System.Drawing.Point(307, 82);
             this.label13.Name = "label13";
-            this.label13.Size = new System.Drawing.Size(146, 41);
+            this.label13.Size = new System.Drawing.Size(74, 21);
             this.label13.TabIndex = 32;
             this.label13.Text = "匹配模式";
             // 
@@ -428,10 +398,9 @@
             // 
             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(614, 98);
-            this.ScanGroupName_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+            this.ScanGroupName_label.Location = new System.Drawing.Point(307, 49);
             this.ScanGroupName_label.Name = "ScanGroupName_label";
-            this.ScanGroupName_label.Size = new System.Drawing.Size(146, 41);
+            this.ScanGroupName_label.Size = new System.Drawing.Size(74, 21);
             this.ScanGroupName_label.TabIndex = 33;
             this.ScanGroupName_label.Text = "策略名称";
             // 
@@ -439,10 +408,9 @@
             // 
             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(928, 566);
-            this.PNScript_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+            this.PNScript_label.Location = new System.Drawing.Point(464, 283);
             this.PNScript_label.Name = "PNScript_label";
-            this.PNScript_label.Size = new System.Drawing.Size(82, 41);
+            this.PNScript_label.Size = new System.Drawing.Size(42, 21);
             this.PNScript_label.TabIndex = 35;
             this.PNScript_label.Text = "脚本";
             // 
@@ -450,38 +418,34 @@
             // 
             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(928, 862);
-            this.DateCodeScript_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+            this.DateCodeScript_label.Location = new System.Drawing.Point(464, 431);
             this.DateCodeScript_label.Name = "DateCodeScript_label";
-            this.DateCodeScript_label.Size = new System.Drawing.Size(82, 41);
+            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(818, 98);
-            this.sg_name.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
+            this.sg_name.Location = new System.Drawing.Point(409, 49);
             this.sg_name.Name = "sg_name";
-            this.sg_name.Size = new System.Drawing.Size(386, 35);
+            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(1420, 100);
-            this.sg_step.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
+            this.sg_step.Location = new System.Drawing.Point(710, 50);
             this.sg_step.Name = "sg_step";
-            this.sg_step.Size = new System.Drawing.Size(146, 35);
+            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(1258, 98);
-            this.ScanStep_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+            this.ScanStep_label.Location = new System.Drawing.Point(629, 49);
             this.ScanStep_label.Name = "ScanStep_label";
-            this.ScanStep_label.Size = new System.Drawing.Size(146, 41);
+            this.ScanStep_label.Size = new System.Drawing.Size(74, 21);
             this.ScanStep_label.TabIndex = 40;
             this.ScanStep_label.Text = "扫描步骤";
             // 
@@ -489,29 +453,26 @@
             // 
             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(1618, 96);
-            this.sg_autolabel.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
+            this.sg_autolabel.Location = new System.Drawing.Point(809, 48);
             this.sg_autolabel.Name = "sg_autolabel";
-            this.sg_autolabel.Size = new System.Drawing.Size(274, 45);
+            this.sg_autolabel.Size = new System.Drawing.Size(141, 25);
             this.sg_autolabel.TabIndex = 41;
             this.sg_autolabel.Text = "自动贴标机标签";
             this.sg_autolabel.UseVisualStyleBackColor = true;
             // 
             // CustomerTreeView
             // 
-            this.CustomerTreeView.Location = new System.Drawing.Point(0, 48);
-            this.CustomerTreeView.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
+            this.CustomerTreeView.Location = new System.Drawing.Point(0, 24);
             this.CustomerTreeView.Name = "CustomerTreeView";
-            this.CustomerTreeView.Size = new System.Drawing.Size(498, 1216);
+            this.CustomerTreeView.Size = new System.Drawing.Size(251, 605);
             this.CustomerTreeView.TabIndex = 0;
             this.CustomerTreeView.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.CustomerTreeView_NodeMouseClick);
             // 
             // Brand
             // 
-            this.Brand.Location = new System.Drawing.Point(170, 2);
-            this.Brand.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
+            this.Brand.Location = new System.Drawing.Point(85, 1);
             this.Brand.Name = "Brand";
-            this.Brand.Size = new System.Drawing.Size(328, 35);
+            this.Brand.Size = new System.Drawing.Size(166, 21);
             this.Brand.TabIndex = 43;
             this.Brand.KeyDown += new System.Windows.Forms.KeyEventHandler(this.Brand_KeyDown);
             // 
@@ -519,20 +480,18 @@
             // 
             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(6, 4);
-            this.label1.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+            this.label1.Location = new System.Drawing.Point(3, 2);
             this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(146, 41);
+            this.label1.Size = new System.Drawing.Size(74, 21);
             this.label1.TabIndex = 44;
             this.label1.Text = "策略名称";
             // 
             // ButtonSaveScanGroup
             // 
             this.ButtonSaveScanGroup.Image = ((System.Drawing.Image)(resources.GetObject("ButtonSaveScanGroup.Image")));
-            this.ButtonSaveScanGroup.Location = new System.Drawing.Point(508, 8);
-            this.ButtonSaveScanGroup.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
+            this.ButtonSaveScanGroup.Location = new System.Drawing.Point(254, 4);
             this.ButtonSaveScanGroup.Name = "ButtonSaveScanGroup";
-            this.ButtonSaveScanGroup.Size = new System.Drawing.Size(128, 46);
+            this.ButtonSaveScanGroup.Size = new System.Drawing.Size(64, 23);
             this.ButtonSaveScanGroup.TabIndex = 42;
             this.ButtonSaveScanGroup.Text = "保存";
             this.ButtonSaveScanGroup.UseVisualStyleBackColor = true;
@@ -541,10 +500,9 @@
             // si_expression4
             // 
             this.si_expression4.Enabled = false;
-            this.si_expression4.Location = new System.Drawing.Point(934, 914);
-            this.si_expression4.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
+            this.si_expression4.Location = new System.Drawing.Point(467, 457);
             this.si_expression4.Name = "si_expression4";
-            this.si_expression4.Size = new System.Drawing.Size(872, 154);
+            this.si_expression4.Size = new System.Drawing.Size(438, 79);
             this.si_expression4.TabIndex = 36;
             this.si_expression4.Tag = "DateCode";
             this.si_expression4.Text = "";
@@ -552,30 +510,27 @@
             // si_expression3
             // 
             this.si_expression3.Enabled = false;
-            this.si_expression3.Location = new System.Drawing.Point(934, 618);
-            this.si_expression3.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
+            this.si_expression3.Location = new System.Drawing.Point(467, 309);
             this.si_expression3.Name = "si_expression3";
-            this.si_expression3.Size = new System.Drawing.Size(872, 154);
+            this.si_expression3.Size = new System.Drawing.Size(438, 79);
             this.si_expression3.TabIndex = 34;
             this.si_expression3.Tag = "QTY";
             this.si_expression3.Text = "";
             // 
             // sg_script
             // 
-            this.sg_script.Location = new System.Drawing.Point(818, 164);
-            this.sg_script.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
+            this.sg_script.Location = new System.Drawing.Point(409, 82);
             this.sg_script.Name = "sg_script";
-            this.sg_script.Size = new System.Drawing.Size(864, 188);
+            this.sg_script.Size = new System.Drawing.Size(434, 96);
             this.sg_script.TabIndex = 31;
             this.sg_script.Text = "";
             // 
             // AddNew
             // 
             this.AddNew.Image = ((System.Drawing.Image)(resources.GetObject("AddNew.Image")));
-            this.AddNew.Location = new System.Drawing.Point(648, 8);
-            this.AddNew.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
+            this.AddNew.Location = new System.Drawing.Point(324, 4);
             this.AddNew.Name = "AddNew";
-            this.AddNew.Size = new System.Drawing.Size(128, 46);
+            this.AddNew.Size = new System.Drawing.Size(64, 23);
             this.AddNew.TabIndex = 45;
             this.AddNew.Text = "新增";
             this.AddNew.UseVisualStyleBackColor = true;
@@ -583,9 +538,9 @@
             // 
             // 采集策略_NEW
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 24F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(2164, 1268);
+            this.ClientSize = new System.Drawing.Size(962, 630);
             this.Controls.Add(this.AddNew);
             this.Controls.Add(this.label1);
             this.Controls.Add(this.Brand);
@@ -632,13 +587,12 @@
             this.Controls.Add(this.si_item4);
             this.Controls.Add(this.si_item1);
             this.Controls.Add(this.CustomerTreeView);
-            this.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.Name = "采集策略_NEW";
             this.Text = "采集策略";
             this.Load += new System.EventHandler(this.采集策略_Load);
             this.SizeChanged += new System.EventHandler(this.采集策略_SizeChanged);
-            ((System.ComponentModel.ISupportInitialize)(sg_step)).EndInit();
-            this.ResumeLayout(true);
+            ((System.ComponentModel.ISupportInitialize)(this.sg_step)).EndInit();
+            this.ResumeLayout(false);
             this.PerformLayout();
 
         }