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

UAS-MES/FunctionCode/OQC/OQC_BatchResultJudge.Designer.cs

@@ -135,7 +135,7 @@
             this.ReworkRequire.AutoSize = true;
             this.ReworkRequire.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.ReworkRequire.Location = new System.Drawing.Point(163, 656);
-            this.ReworkRequire.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.ReworkRequire.Margin = new System.Windows.Forms.Padding(4);
             this.ReworkRequire.Name = "ReworkRequire";
             this.ReworkRequire.Size = new System.Drawing.Size(154, 31);
             this.ReworkRequire.TabIndex = 168;
@@ -215,7 +215,7 @@
             this.panel2.Controls.Add(this.label1);
             this.panel2.Dock = System.Windows.Forms.DockStyle.Top;
             this.panel2.Location = new System.Drawing.Point(0, 0);
-            this.panel2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.panel2.Margin = new System.Windows.Forms.Padding(4);
             this.panel2.Name = "panel2";
             this.panel2.Size = new System.Drawing.Size(1309, 38);
             this.panel2.TabIndex = 220;
@@ -258,7 +258,7 @@
             // richTextBox1
             // 
             this.richTextBox1.Location = new System.Drawing.Point(117, 239);
-            this.richTextBox1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.richTextBox1.Margin = new System.Windows.Forms.Padding(4);
             this.richTextBox1.Name = "richTextBox1";
             this.richTextBox1.Size = new System.Drawing.Size(547, 280);
             this.richTextBox1.TabIndex = 225;
@@ -349,7 +349,7 @@
             // 
             // GetBatch
             // 
-            this.GetBatch.AllPower = "ifall";
+            this.GetBatch.AllPower = "";
             this.GetBatch.BackColor = System.Drawing.Color.Transparent;
             this.GetBatch.DownImage = ((System.Drawing.Image)(resources.GetObject("GetBatch.DownImage")));
             this.GetBatch.Image = ((System.Drawing.Image)(resources.GetObject("GetBatch.Image")));
@@ -359,7 +359,7 @@
             this.GetBatch.MoveImage = ((System.Drawing.Image)(resources.GetObject("GetBatch.MoveImage")));
             this.GetBatch.Name = "GetBatch";
             this.GetBatch.NormalImage = ((System.Drawing.Image)(resources.GetObject("GetBatch.NormalImage")));
-            this.GetBatch.Power = "ifRead";
+            this.GetBatch.Power = "";
             this.GetBatch.Size = new System.Drawing.Size(80, 30);
             this.GetBatch.TabIndex = 221;
             this.GetBatch.Text = "获取批";
@@ -402,13 +402,13 @@
             // 
             // ob_checkno
             // 
-            this.ob_checkno.AllPower = "ifall";
+            this.ob_checkno.AllPower = "";
             this.ob_checkno.BackColor = System.Drawing.Color.White;
             this.ob_checkno.ID = null;
             this.ob_checkno.Location = new System.Drawing.Point(117, 54);
             this.ob_checkno.Margin = new System.Windows.Forms.Padding(4);
             this.ob_checkno.Name = "ob_checkno";
-            this.ob_checkno.Power = "ifread";
+            this.ob_checkno.Power = "";
             this.ob_checkno.Size = new System.Drawing.Size(547, 25);
             this.ob_checkno.Str = null;
             this.ob_checkno.Str1 = null;
@@ -436,13 +436,13 @@
             // 
             // ms_sncode
             // 
-            this.ms_sncode.AllPower = "ifall";
+            this.ms_sncode.AllPower = "";
             this.ms_sncode.BackColor = System.Drawing.Color.White;
             this.ms_sncode.ID = null;
             this.ms_sncode.Location = new System.Drawing.Point(117, 136);
             this.ms_sncode.Margin = new System.Windows.Forms.Padding(4);
             this.ms_sncode.Name = "ms_sncode";
-            this.ms_sncode.Power = "ifread";
+            this.ms_sncode.Power = "";
             this.ms_sncode.Size = new System.Drawing.Size(547, 25);
             this.ms_sncode.Str = null;
             this.ms_sncode.Str1 = null;
@@ -555,7 +555,7 @@
             // 
             // WithdrawPass
             // 
-            this.WithdrawPass.AllPower = "ifall";
+            this.WithdrawPass.AllPower = "";
             this.WithdrawPass.BackColor = System.Drawing.Color.Transparent;
             this.WithdrawPass.DownImage = ((System.Drawing.Image)(resources.GetObject("WithdrawPass.DownImage")));
             this.WithdrawPass.Enabled = false;
@@ -566,7 +566,7 @@
             this.WithdrawPass.MoveImage = ((System.Drawing.Image)(resources.GetObject("WithdrawPass.MoveImage")));
             this.WithdrawPass.Name = "WithdrawPass";
             this.WithdrawPass.NormalImage = ((System.Drawing.Image)(resources.GetObject("WithdrawPass.NormalImage")));
-            this.WithdrawPass.Power = "ifWrite";
+            this.WithdrawPass.Power = "";
             this.WithdrawPass.Size = new System.Drawing.Size(91, 38);
             this.WithdrawPass.TabIndex = 167;
             this.WithdrawPass.Text = "撤销通过";
@@ -575,7 +575,7 @@
             // 
             // BatchRejection
             // 
-            this.BatchRejection.AllPower = "ifall";
+            this.BatchRejection.AllPower = "";
             this.BatchRejection.BackColor = System.Drawing.Color.Transparent;
             this.BatchRejection.DownImage = ((System.Drawing.Image)(resources.GetObject("BatchRejection.DownImage")));
             this.BatchRejection.Enabled = false;
@@ -586,7 +586,7 @@
             this.BatchRejection.MoveImage = ((System.Drawing.Image)(resources.GetObject("BatchRejection.MoveImage")));
             this.BatchRejection.Name = "BatchRejection";
             this.BatchRejection.NormalImage = ((System.Drawing.Image)(resources.GetObject("BatchRejection.NormalImage")));
-            this.BatchRejection.Power = "ifWrite";
+            this.BatchRejection.Power = "";
             this.BatchRejection.Size = new System.Drawing.Size(91, 38);
             this.BatchRejection.TabIndex = 166;
             this.BatchRejection.Text = "批次退";
@@ -595,7 +595,7 @@
             // 
             // ForcePass
             // 
-            this.ForcePass.AllPower = "ifall";
+            this.ForcePass.AllPower = "";
             this.ForcePass.BackColor = System.Drawing.Color.Transparent;
             this.ForcePass.DownImage = ((System.Drawing.Image)(resources.GetObject("ForcePass.DownImage")));
             this.ForcePass.Enabled = false;
@@ -606,7 +606,7 @@
             this.ForcePass.MoveImage = ((System.Drawing.Image)(resources.GetObject("ForcePass.MoveImage")));
             this.ForcePass.Name = "ForcePass";
             this.ForcePass.NormalImage = ((System.Drawing.Image)(resources.GetObject("ForcePass.NormalImage")));
-            this.ForcePass.Power = "ifWrite";
+            this.ForcePass.Power = "";
             this.ForcePass.Size = new System.Drawing.Size(91, 38);
             this.ForcePass.TabIndex = 165;
             this.ForcePass.Text = "强制通过";
@@ -615,7 +615,7 @@
             // 
             // ForceRejection
             // 
-            this.ForceRejection.AllPower = "ifall";
+            this.ForceRejection.AllPower = "";
             this.ForceRejection.BackColor = System.Drawing.Color.Transparent;
             this.ForceRejection.DownImage = ((System.Drawing.Image)(resources.GetObject("ForceRejection.DownImage")));
             this.ForceRejection.Enabled = false;
@@ -626,7 +626,7 @@
             this.ForceRejection.MoveImage = ((System.Drawing.Image)(resources.GetObject("ForceRejection.MoveImage")));
             this.ForceRejection.Name = "ForceRejection";
             this.ForceRejection.NormalImage = ((System.Drawing.Image)(resources.GetObject("ForceRejection.NormalImage")));
-            this.ForceRejection.Power = "ifWrite";
+            this.ForceRejection.Power = "";
             this.ForceRejection.Size = new System.Drawing.Size(91, 38);
             this.ForceRejection.TabIndex = 164;
             this.ForceRejection.Text = "强制批退";
@@ -635,7 +635,7 @@
             // 
             // WithdrawRejection
             // 
-            this.WithdrawRejection.AllPower = "ifall";
+            this.WithdrawRejection.AllPower = "";
             this.WithdrawRejection.BackColor = System.Drawing.Color.Transparent;
             this.WithdrawRejection.DownImage = ((System.Drawing.Image)(resources.GetObject("WithdrawRejection.DownImage")));
             this.WithdrawRejection.Enabled = false;
@@ -646,7 +646,7 @@
             this.WithdrawRejection.MoveImage = ((System.Drawing.Image)(resources.GetObject("WithdrawRejection.MoveImage")));
             this.WithdrawRejection.Name = "WithdrawRejection";
             this.WithdrawRejection.NormalImage = ((System.Drawing.Image)(resources.GetObject("WithdrawRejection.NormalImage")));
-            this.WithdrawRejection.Power = "ifWrite";
+            this.WithdrawRejection.Power = "";
             this.WithdrawRejection.Size = new System.Drawing.Size(91, 38);
             this.WithdrawRejection.TabIndex = 163;
             this.WithdrawRejection.Text = "撤销判退";
@@ -655,7 +655,7 @@
             // 
             // BatchPass
             // 
-            this.BatchPass.AllPower = "ifall";
+            this.BatchPass.AllPower = "";
             this.BatchPass.BackColor = System.Drawing.Color.Transparent;
             this.BatchPass.DownImage = ((System.Drawing.Image)(resources.GetObject("BatchPass.DownImage")));
             this.BatchPass.Enabled = false;
@@ -666,7 +666,7 @@
             this.BatchPass.MoveImage = ((System.Drawing.Image)(resources.GetObject("BatchPass.MoveImage")));
             this.BatchPass.Name = "BatchPass";
             this.BatchPass.NormalImage = ((System.Drawing.Image)(resources.GetObject("BatchPass.NormalImage")));
-            this.BatchPass.Power = "ifWrite";
+            this.BatchPass.Power = "";
             this.BatchPass.Size = new System.Drawing.Size(91, 38);
             this.BatchPass.TabIndex = 162;
             this.BatchPass.Text = "批判过";
@@ -751,7 +751,7 @@
             this.Controls.Add(this.ob_ngqty_label);
             this.Controls.Add(this.oi_checkqty_label);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
-            this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.Margin = new System.Windows.Forms.Padding(4);
             this.Name = "OQC_BatchResultJudge";
             this.Tag = "OQC!BatchResultJudge";
             this.Text = "抽检批维护";

UAS-MES/UAS-MES.csproj

@@ -69,10 +69,11 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <PropertyGroup>
-    <ManifestCertificateThumbprint>5B3D94907A05B1AD2095911FAA702517121A1C03</ManifestCertificateThumbprint>
+    <ManifestCertificateThumbprint>0702B5BD480611CA32663309A8FD3717B722E307</ManifestCertificateThumbprint>
   </PropertyGroup>
   <PropertyGroup>
-    <ManifestKeyFile>UAS-MES_TemporaryKey.pfx</ManifestKeyFile>
+    <ManifestKeyFile>
+    </ManifestKeyFile>
   </PropertyGroup>
   <PropertyGroup>
     <GenerateManifests>true</GenerateManifests>
@@ -1086,7 +1087,6 @@
       <DependentUpon>Settings.settings</DependentUpon>
       <DesignTimeSharedInput>True</DesignTimeSharedInput>
     </Compile>
-    <None Include="UAS-MES_TemporaryKey.pfx" />
   </ItemGroup>
   <ItemGroup>
     <None Include="App.config">