浏览代码

更新Caller

章政 7 年之前
父节点
当前提交
7862a42b03

+ 42 - 41
UAS-MES/FunctionCode/Make/Make_UpdateCollectCode.Designer.cs

@@ -63,12 +63,12 @@
             this.psr_length,
             this.Column1});
             this.collectCodeRules.Enabled = false;
-            this.collectCodeRules.Location = new System.Drawing.Point(279, 70);
-            this.collectCodeRules.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.collectCodeRules.Location = new System.Drawing.Point(186, 47);
+            this.collectCodeRules.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
             this.collectCodeRules.Name = "collectCodeRules";
             this.collectCodeRules.RowHeadersVisible = false;
             this.collectCodeRules.RowTemplate.Height = 30;
-            this.collectCodeRules.Size = new System.Drawing.Size(734, 235);
+            this.collectCodeRules.Size = new System.Drawing.Size(489, 157);
             this.collectCodeRules.TabIndex = 6;
             // 
             // psr_type
@@ -103,9 +103,10 @@
             // 
             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(274, 26);
+            this.label1.Location = new System.Drawing.Point(183, 17);
+            this.label1.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(110, 31);
+            this.label1.Size = new System.Drawing.Size(74, 21);
             this.label1.TabIndex = 7;
             this.label1.Text = "防呆规则";
             // 
@@ -142,11 +143,11 @@
             this.collects.Controls.Add(this.Imei1);
             this.collects.Controls.Add(this.Imei2);
             this.collects.Controls.Add(this.Imei3);
-            this.collects.Location = new System.Drawing.Point(27, 18);
-            this.collects.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.collects.Location = new System.Drawing.Point(18, 12);
+            this.collects.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
             this.collects.Name = "collects";
-            this.collects.Padding = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.collects.Size = new System.Drawing.Size(224, 287);
+            this.collects.Padding = new System.Windows.Forms.Padding(2, 1, 2, 1);
+            this.collects.Size = new System.Drawing.Size(149, 191);
             this.collects.TabIndex = 92;
             this.collects.TabStop = false;
             this.collects.TextColor = System.Drawing.Color.Black;
@@ -155,11 +156,11 @@
             // 
             this.Mac.AutoSize = true;
             this.Mac.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.Mac.Location = new System.Drawing.Point(37, 23);
-            this.Mac.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.Mac.Location = new System.Drawing.Point(25, 15);
+            this.Mac.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
             this.Mac.Name = "Mac";
             this.Mac.Power = null;
-            this.Mac.Size = new System.Drawing.Size(157, 35);
+            this.Mac.Size = new System.Drawing.Size(109, 25);
             this.Mac.TabIndex = 5;
             this.Mac.Text = "MAC/WIFI";
             this.Mac.UseVisualStyleBackColor = true;
@@ -169,11 +170,11 @@
             // 
             this.Bt.AutoSize = true;
             this.Bt.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.Bt.Location = new System.Drawing.Point(37, 67);
-            this.Bt.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.Bt.Location = new System.Drawing.Point(25, 44);
+            this.Bt.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
             this.Bt.Name = "Bt";
             this.Bt.Power = null;
-            this.Bt.Size = new System.Drawing.Size(69, 35);
+            this.Bt.Size = new System.Drawing.Size(48, 25);
             this.Bt.TabIndex = 4;
             this.Bt.Text = "BT";
             this.Bt.UseVisualStyleBackColor = true;
@@ -183,11 +184,11 @@
             // 
             this.NetCode.AutoSize = true;
             this.NetCode.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.NetCode.Location = new System.Drawing.Point(37, 110);
-            this.NetCode.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.NetCode.Location = new System.Drawing.Point(25, 73);
+            this.NetCode.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
             this.NetCode.Name = "NetCode";
             this.NetCode.Power = null;
-            this.NetCode.Size = new System.Drawing.Size(88, 35);
+            this.NetCode.Size = new System.Drawing.Size(61, 25);
             this.NetCode.TabIndex = 3;
             this.NetCode.Text = "网标";
             this.NetCode.UseVisualStyleBackColor = true;
@@ -197,11 +198,11 @@
             // 
             this.Imei1.AutoSize = true;
             this.Imei1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.Imei1.Location = new System.Drawing.Point(37, 154);
-            this.Imei1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.Imei1.Location = new System.Drawing.Point(25, 102);
+            this.Imei1.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
             this.Imei1.Name = "Imei1";
             this.Imei1.Power = null;
-            this.Imei1.Size = new System.Drawing.Size(104, 35);
+            this.Imei1.Size = new System.Drawing.Size(73, 25);
             this.Imei1.TabIndex = 2;
             this.Imei1.Text = "IMEI1";
             this.Imei1.UseVisualStyleBackColor = true;
@@ -211,11 +212,11 @@
             // 
             this.Imei2.AutoSize = true;
             this.Imei2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.Imei2.Location = new System.Drawing.Point(37, 198);
-            this.Imei2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.Imei2.Location = new System.Drawing.Point(25, 131);
+            this.Imei2.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
             this.Imei2.Name = "Imei2";
             this.Imei2.Power = null;
-            this.Imei2.Size = new System.Drawing.Size(104, 35);
+            this.Imei2.Size = new System.Drawing.Size(73, 25);
             this.Imei2.TabIndex = 1;
             this.Imei2.Text = "IMEI2";
             this.Imei2.UseVisualStyleBackColor = true;
@@ -225,11 +226,11 @@
             // 
             this.Imei3.AutoSize = true;
             this.Imei3.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.Imei3.Location = new System.Drawing.Point(37, 241);
-            this.Imei3.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.Imei3.Location = new System.Drawing.Point(25, 160);
+            this.Imei3.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
             this.Imei3.Name = "Imei3";
             this.Imei3.Power = null;
-            this.Imei3.Size = new System.Drawing.Size(104, 35);
+            this.Imei3.Size = new System.Drawing.Size(73, 25);
             this.Imei3.TabIndex = 0;
             this.Imei3.Text = "IMEI3";
             this.Imei3.UseVisualStyleBackColor = true;
@@ -240,11 +241,11 @@
             this.inputValue.AllPower = null;
             this.inputValue.BackColor = System.Drawing.Color.White;
             this.inputValue.ID = null;
-            this.inputValue.Location = new System.Drawing.Point(165, 572);
-            this.inputValue.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.inputValue.Location = new System.Drawing.Point(110, 381);
+            this.inputValue.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
             this.inputValue.Name = "inputValue";
             this.inputValue.Power = null;
-            this.inputValue.Size = new System.Drawing.Size(257, 28);
+            this.inputValue.Size = new System.Drawing.Size(173, 21);
             this.inputValue.Str = null;
             this.inputValue.Str1 = null;
             this.inputValue.Str2 = null;
@@ -254,10 +255,9 @@
             // OperateResult
             // 
             this.OperateResult.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.OperateResult.Location = new System.Drawing.Point(27, 326);
-            this.OperateResult.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.OperateResult.Location = new System.Drawing.Point(18, 217);
             this.OperateResult.Name = "OperateResult";
-            this.OperateResult.Size = new System.Drawing.Size(985, 228);
+            this.OperateResult.Size = new System.Drawing.Size(658, 153);
             this.OperateResult.TabIndex = 88;
             this.OperateResult.Text = "";
             // 
@@ -265,17 +265,18 @@
             // 
             this.label3.AutoSize = true;
             this.label3.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label3.Location = new System.Drawing.Point(78, 570);
+            this.label3.Location = new System.Drawing.Point(52, 380);
+            this.label3.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(86, 31);
+            this.label3.Size = new System.Drawing.Size(58, 21);
             this.label3.TabIndex = 93;
             this.label3.Text = "输入框";
             // 
             // Make_UpdateCollectCode
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1040, 614);
+            this.ClientSize = new System.Drawing.Size(693, 409);
             this.Controls.Add(this.label3);
             this.Controls.Add(this.collects);
             this.Controls.Add(this.inputValue);
@@ -283,16 +284,16 @@
             this.Controls.Add(this.label1);
             this.Controls.Add(this.collectCodeRules);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
-            this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
             this.Name = "Make_UpdateCollectCode";
-            this.Text = "Make!UpdateCollectCode";
+            this.Tag = "Make!UpdateCollectCode";
             this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.Make_UpdateCollectCode_FormClosing);
             this.Load += new System.EventHandler(this.Make_UpdateCollectCode_Load);
             this.SizeChanged += new System.EventHandler(this.Make_UpdateCollectCode_SizeChanged);
             ((System.ComponentModel.ISupportInitialize)(this.collectCodeRules)).EndInit();
-            this.collects.ResumeLayout(true);
+            this.collects.ResumeLayout(false);
             this.collects.PerformLayout();
-            this.ResumeLayout(true);
+            this.ResumeLayout(false);
             this.PerformLayout();
 
         }

+ 0 - 12
UAS-MES/FunctionCode/Make/Make_UpdateCollectCode.resx

@@ -129,16 +129,4 @@
   <metadata name="Column1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="psr_type.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="psr_prefix.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="psr_length.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="Column1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
 </root>