|
@@ -168,6 +168,7 @@
|
|
|
this.MidLabelAutoPrint = new System.Windows.Forms.CheckBox();
|
|
|
this.MidLabelCombox = new System.Windows.Forms.ComboBox();
|
|
|
this.OutBoxLabel = new UAS_LabelMachine.CustomControl.GroupBoxWithBorder.GroupBoxWithBorder();
|
|
|
+ this.DiffCPN = new System.Windows.Forms.CheckBox();
|
|
|
this.BoxCount = new System.Windows.Forms.Label();
|
|
|
this.DiffLotNo = new System.Windows.Forms.CheckBox();
|
|
|
this.DiffDC = new System.Windows.Forms.CheckBox();
|
|
@@ -182,7 +183,6 @@
|
|
|
this.OutboxCapacity = new System.Windows.Forms.NumericUpDown();
|
|
|
this.OutBoxLabelPrint = new System.Windows.Forms.Button();
|
|
|
this.OutBoxCombox = new System.Windows.Forms.ComboBox();
|
|
|
- this.DiffCPN = new System.Windows.Forms.CheckBox();
|
|
|
((System.ComponentModel.ISupportInitialize)(this.MidSource)).BeginInit();
|
|
|
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
|
|
|
this.groupBoxWithBorder2.SuspendLayout();
|
|
@@ -814,7 +814,7 @@
|
|
|
this.Weight.AutoSize = true;
|
|
|
this.Weight.Font = new System.Drawing.Font("微软雅黑", 30F);
|
|
|
this.Weight.ForeColor = System.Drawing.Color.Red;
|
|
|
- this.Weight.Location = new System.Drawing.Point(7, 32);
|
|
|
+ this.Weight.Location = new System.Drawing.Point(6, 31);
|
|
|
this.Weight.Name = "Weight";
|
|
|
this.Weight.Size = new System.Drawing.Size(0, 52);
|
|
|
this.Weight.TabIndex = 113;
|
|
@@ -1049,7 +1049,7 @@
|
|
|
//
|
|
|
this.label18.AutoSize = true;
|
|
|
this.label18.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
|
|
|
- this.label18.Location = new System.Drawing.Point(66, 124);
|
|
|
+ this.label18.Location = new System.Drawing.Point(65, 123);
|
|
|
this.label18.Name = "label18";
|
|
|
this.label18.Size = new System.Drawing.Size(13, 17);
|
|
|
this.label18.TabIndex = 90;
|
|
@@ -1083,7 +1083,7 @@
|
|
|
//
|
|
|
this.label16.AutoSize = true;
|
|
|
this.label16.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
|
|
|
- this.label16.Location = new System.Drawing.Point(64, 60);
|
|
|
+ this.label16.Location = new System.Drawing.Point(63, 59);
|
|
|
this.label16.Name = "label16";
|
|
|
this.label16.Size = new System.Drawing.Size(13, 17);
|
|
|
this.label16.TabIndex = 87;
|
|
@@ -1117,7 +1117,7 @@
|
|
|
//
|
|
|
this.label12.AutoSize = true;
|
|
|
this.label12.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
|
|
|
- this.label12.Location = new System.Drawing.Point(8, 90);
|
|
|
+ this.label12.Location = new System.Drawing.Point(7, 89);
|
|
|
this.label12.Name = "label12";
|
|
|
this.label12.Size = new System.Drawing.Size(56, 17);
|
|
|
this.label12.TabIndex = 77;
|
|
@@ -1127,7 +1127,7 @@
|
|
|
//
|
|
|
this.label7.AutoSize = true;
|
|
|
this.label7.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
|
|
|
- this.label7.Location = new System.Drawing.Point(6, 28);
|
|
|
+ this.label7.Location = new System.Drawing.Point(5, 27);
|
|
|
this.label7.Name = "label7";
|
|
|
this.label7.Size = new System.Drawing.Size(56, 17);
|
|
|
this.label7.TabIndex = 76;
|
|
@@ -1434,7 +1434,7 @@
|
|
|
//
|
|
|
this.SingleLabelPrint.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
|
|
|
this.SingleLabelPrint.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
|
|
|
- this.SingleLabelPrint.Location = new System.Drawing.Point(26, 176);
|
|
|
+ this.SingleLabelPrint.Location = new System.Drawing.Point(-3, 175);
|
|
|
this.SingleLabelPrint.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
|
|
|
this.SingleLabelPrint.Name = "SingleLabelPrint";
|
|
|
this.SingleLabelPrint.Size = new System.Drawing.Size(68, 26);
|
|
@@ -1449,7 +1449,7 @@
|
|
|
this.SingleLabelAutoPrint.Checked = true;
|
|
|
this.SingleLabelAutoPrint.CheckState = System.Windows.Forms.CheckState.Checked;
|
|
|
this.SingleLabelAutoPrint.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
|
|
|
- this.SingleLabelAutoPrint.Location = new System.Drawing.Point(12, 96);
|
|
|
+ this.SingleLabelAutoPrint.Location = new System.Drawing.Point(11, 95);
|
|
|
this.SingleLabelAutoPrint.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
|
|
|
this.SingleLabelAutoPrint.Name = "SingleLabelAutoPrint";
|
|
|
this.SingleLabelAutoPrint.Size = new System.Drawing.Size(75, 21);
|
|
@@ -1496,7 +1496,7 @@
|
|
|
this.CurrentRowOnly.Checked = true;
|
|
|
this.CurrentRowOnly.CheckState = System.Windows.Forms.CheckState.Checked;
|
|
|
this.CurrentRowOnly.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
|
|
|
- this.CurrentRowOnly.Location = new System.Drawing.Point(84, 97);
|
|
|
+ this.CurrentRowOnly.Location = new System.Drawing.Point(83, 96);
|
|
|
this.CurrentRowOnly.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
|
|
|
this.CurrentRowOnly.Name = "CurrentRowOnly";
|
|
|
this.CurrentRowOnly.Size = new System.Drawing.Size(87, 21);
|
|
@@ -1522,7 +1522,7 @@
|
|
|
//
|
|
|
this.label2.AutoSize = true;
|
|
|
this.label2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
|
|
|
- this.label2.Location = new System.Drawing.Point(8, 124);
|
|
|
+ this.label2.Location = new System.Drawing.Point(7, 123);
|
|
|
this.label2.Name = "label2";
|
|
|
this.label2.Size = new System.Drawing.Size(32, 17);
|
|
|
this.label2.TabIndex = 92;
|
|
@@ -1545,7 +1545,7 @@
|
|
|
//
|
|
|
this.label5.AutoSize = true;
|
|
|
this.label5.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
|
|
|
- this.label5.Location = new System.Drawing.Point(8, 156);
|
|
|
+ this.label5.Location = new System.Drawing.Point(7, 155);
|
|
|
this.label5.Name = "label5";
|
|
|
this.label5.Size = new System.Drawing.Size(32, 17);
|
|
|
this.label5.TabIndex = 50;
|
|
@@ -1578,7 +1578,7 @@
|
|
|
this.MidLabelAutoPrint.Checked = true;
|
|
|
this.MidLabelAutoPrint.CheckState = System.Windows.Forms.CheckState.Checked;
|
|
|
this.MidLabelAutoPrint.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
|
|
|
- this.MidLabelAutoPrint.Location = new System.Drawing.Point(6, 96);
|
|
|
+ this.MidLabelAutoPrint.Location = new System.Drawing.Point(5, 95);
|
|
|
this.MidLabelAutoPrint.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
|
|
|
this.MidLabelAutoPrint.Name = "MidLabelAutoPrint";
|
|
|
this.MidLabelAutoPrint.Size = new System.Drawing.Size(75, 21);
|
|
@@ -1625,11 +1625,23 @@
|
|
|
this.OutBoxLabel.TabStop = false;
|
|
|
this.OutBoxLabel.Text = "外箱标签";
|
|
|
//
|
|
|
+ // DiffCPN
|
|
|
+ //
|
|
|
+ this.DiffCPN.AutoSize = true;
|
|
|
+ this.DiffCPN.Font = new System.Drawing.Font("微软雅黑", 8F);
|
|
|
+ this.DiffCPN.Location = new System.Drawing.Point(124, 166);
|
|
|
+ this.DiffCPN.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
|
|
|
+ this.DiffCPN.Name = "DiffCPN";
|
|
|
+ this.DiffCPN.Size = new System.Drawing.Size(72, 20);
|
|
|
+ this.DiffCPN.TabIndex = 98;
|
|
|
+ this.DiffCPN.Text = "区分CPN";
|
|
|
+ this.DiffCPN.UseVisualStyleBackColor = true;
|
|
|
+ //
|
|
|
// BoxCount
|
|
|
//
|
|
|
this.BoxCount.AutoSize = true;
|
|
|
this.BoxCount.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
|
|
|
- this.BoxCount.Location = new System.Drawing.Point(7, 182);
|
|
|
+ this.BoxCount.Location = new System.Drawing.Point(130, 186);
|
|
|
this.BoxCount.Name = "BoxCount";
|
|
|
this.BoxCount.Size = new System.Drawing.Size(0, 17);
|
|
|
this.BoxCount.TabIndex = 97;
|
|
@@ -1637,11 +1649,11 @@
|
|
|
// DiffLotNo
|
|
|
//
|
|
|
this.DiffLotNo.AutoSize = true;
|
|
|
- this.DiffLotNo.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
|
|
|
- this.DiffLotNo.Location = new System.Drawing.Point(125, 148);
|
|
|
+ this.DiffLotNo.Font = new System.Drawing.Font("微软雅黑", 8F);
|
|
|
+ this.DiffLotNo.Location = new System.Drawing.Point(124, 142);
|
|
|
this.DiffLotNo.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
|
|
|
this.DiffLotNo.Name = "DiffLotNo";
|
|
|
- this.DiffLotNo.Size = new System.Drawing.Size(67, 21);
|
|
|
+ this.DiffLotNo.Size = new System.Drawing.Size(64, 20);
|
|
|
this.DiffLotNo.TabIndex = 96;
|
|
|
this.DiffLotNo.Text = "区分LN";
|
|
|
this.DiffLotNo.UseVisualStyleBackColor = true;
|
|
@@ -1649,11 +1661,11 @@
|
|
|
// DiffDC
|
|
|
//
|
|
|
this.DiffDC.AutoSize = true;
|
|
|
- this.DiffDC.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
|
|
|
- this.DiffDC.Location = new System.Drawing.Point(125, 121);
|
|
|
+ this.DiffDC.Font = new System.Drawing.Font("微软雅黑", 8F);
|
|
|
+ this.DiffDC.Location = new System.Drawing.Point(124, 116);
|
|
|
this.DiffDC.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
|
|
|
this.DiffDC.Name = "DiffDC";
|
|
|
- this.DiffDC.Size = new System.Drawing.Size(68, 21);
|
|
|
+ this.DiffDC.Size = new System.Drawing.Size(64, 20);
|
|
|
this.DiffDC.TabIndex = 95;
|
|
|
this.DiffDC.Text = "区分DC";
|
|
|
this.DiffDC.UseVisualStyleBackColor = true;
|
|
@@ -1661,11 +1673,11 @@
|
|
|
// OnlyOneRow
|
|
|
//
|
|
|
this.OnlyOneRow.AutoSize = true;
|
|
|
- this.OnlyOneRow.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
|
|
|
- this.OnlyOneRow.Location = new System.Drawing.Point(125, 96);
|
|
|
+ this.OnlyOneRow.Font = new System.Drawing.Font("微软雅黑", 8F);
|
|
|
+ this.OnlyOneRow.Location = new System.Drawing.Point(124, 92);
|
|
|
this.OnlyOneRow.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
|
|
|
this.OnlyOneRow.Name = "OnlyOneRow";
|
|
|
- this.OnlyOneRow.Size = new System.Drawing.Size(63, 21);
|
|
|
+ this.OnlyOneRow.Size = new System.Drawing.Size(60, 20);
|
|
|
this.OnlyOneRow.TabIndex = 94;
|
|
|
this.OnlyOneRow.Text = "仅单行";
|
|
|
this.OnlyOneRow.UseVisualStyleBackColor = true;
|
|
@@ -1674,7 +1686,7 @@
|
|
|
//
|
|
|
this.AllLabel.AutoSize = true;
|
|
|
this.AllLabel.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
|
|
|
- this.AllLabel.Location = new System.Drawing.Point(10, 96);
|
|
|
+ this.AllLabel.Location = new System.Drawing.Point(9, 95);
|
|
|
this.AllLabel.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
|
|
|
this.AllLabel.Name = "AllLabel";
|
|
|
this.AllLabel.Size = new System.Drawing.Size(99, 21);
|
|
@@ -1685,7 +1697,7 @@
|
|
|
// AddNewOutBox
|
|
|
//
|
|
|
this.AddNewOutBox.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
|
|
|
- this.AddNewOutBox.Location = new System.Drawing.Point(3, 178);
|
|
|
+ this.AddNewOutBox.Location = new System.Drawing.Point(9, 177);
|
|
|
this.AddNewOutBox.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
|
|
|
this.AddNewOutBox.Name = "AddNewOutBox";
|
|
|
this.AddNewOutBox.Size = new System.Drawing.Size(51, 26);
|
|
@@ -1697,7 +1709,7 @@
|
|
|
// LogingOut
|
|
|
//
|
|
|
this.LogingOut.AutoSize = true;
|
|
|
- this.LogingOut.Location = new System.Drawing.Point(114, 8);
|
|
|
+ this.LogingOut.Location = new System.Drawing.Point(113, 7);
|
|
|
this.LogingOut.Name = "LogingOut";
|
|
|
this.LogingOut.Size = new System.Drawing.Size(42, 21);
|
|
|
this.LogingOut.TabIndex = 77;
|
|
@@ -1724,7 +1736,7 @@
|
|
|
//
|
|
|
this.label10.AutoSize = true;
|
|
|
this.label10.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
|
|
|
- this.label10.Location = new System.Drawing.Point(16, 153);
|
|
|
+ this.label10.Location = new System.Drawing.Point(15, 152);
|
|
|
this.label10.Name = "label10";
|
|
|
this.label10.Size = new System.Drawing.Size(32, 17);
|
|
|
this.label10.TabIndex = 90;
|
|
@@ -1734,7 +1746,7 @@
|
|
|
//
|
|
|
this.label6.AutoSize = true;
|
|
|
this.label6.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
|
|
|
- this.label6.Location = new System.Drawing.Point(16, 124);
|
|
|
+ this.label6.Location = new System.Drawing.Point(15, 123);
|
|
|
this.label6.Name = "label6";
|
|
|
this.label6.Size = new System.Drawing.Size(32, 17);
|
|
|
this.label6.TabIndex = 87;
|
|
@@ -1788,18 +1800,6 @@
|
|
|
this.OutBoxCombox.TabIndex = 78;
|
|
|
this.OutBoxCombox.SelectedIndexChanged += new System.EventHandler(this.OutBoxCombox_SelectedIndexChanged);
|
|
|
//
|
|
|
- // DiffCPN
|
|
|
- //
|
|
|
- this.DiffCPN.AutoSize = true;
|
|
|
- this.DiffCPN.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
|
|
|
- this.DiffCPN.Location = new System.Drawing.Point(125, 177);
|
|
|
- this.DiffCPN.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
|
|
|
- this.DiffCPN.Name = "DiffCPN";
|
|
|
- this.DiffCPN.Size = new System.Drawing.Size(76, 21);
|
|
|
- this.DiffCPN.TabIndex = 98;
|
|
|
- this.DiffCPN.Text = "区分CPN";
|
|
|
- this.DiffCPN.UseVisualStyleBackColor = true;
|
|
|
- //
|
|
|
// UAS_出货标签打印
|
|
|
//
|
|
|
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
|