接口项目调整，抽样计划维护和批结果判断调整

UAS-MES/FunctionCode/OQC/OQC_BatchResultJudge.cs

@@ -164,7 +164,7 @@ namespace UAS_MES.OQC
         {
             if (ob_result.Text == "OK" || ob_result.Text == "FOK")
             {
-                dh.ExecuteSql("update OQCBatch set ob_status='UNCHECK' ,ob_result='' where ob_checkno='" + ob_checkno.Text + "'", "select");
+                dh.ExecuteSql("update OQCBatch set ob_status='CHECKING' ,ob_result='' where ob_checkno='" + ob_checkno.Text + "'", "select");
                 ob_result.Text = "";
                 DoLog("撤销通过", "撤销通过成功", "撤销");
                 OperateResult.AppendText(">>撤销通过批" + ob_checkno.Text + "成功\n", Color.Green);
@@ -199,7 +199,7 @@ namespace UAS_MES.OQC
                         else return;
                     }
                 }
-                dh.ExecuteSql("update OQCBatch set ob_status='UNCHECK' ,ob_result='' where ob_checkno='" + ob_checkno.Text + "'", "select");
+                dh.ExecuteSql("update OQCBatch set ob_status='CHECKING' ,ob_result='' where ob_checkno='" + ob_checkno.Text + "'", "select");
                 ob_result.Text = "";
                 DoLog("撤销判退", "撤销判退成功", "撤销");
                 OperateResult.AppendText(">>撤销判退成功\n", Color.Green);

UAS-MES/FunctionCode/OQC/OQC_PlanMaintain.cs

@@ -38,6 +38,8 @@ namespace UAS_MES.OQC
             ob_aqlcode.SetValueField = new string[] { "ob_aqlcode" };
             ob_aqlcode.FormName = Name;
             ob_aqlcode.Condition = "al_statuscode='AUDITED'";
+
+            ChooseAll.ChooseAll(CheckTypeDGV);
         }
 
         private void 抽样计划维护_SizeChanged(object sender, EventArgs e)

UAS-MES/FunctionCode/OQC/OQC_PlanMaintain.designer.cs

@@ -65,6 +65,7 @@
             this.obd_outboxcode = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.ob_checkno = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.ms_sncode = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.ChooseAll = new UAS_MES.CustomControl.ButtonUtil.ChooseAllButton();
             this.panel2.SuspendLayout();
             this.panel1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.CheckTypeDGV)).BeginInit();
@@ -154,7 +155,7 @@
             // 
             this.ob_remark_label.AutoSize = true;
             this.ob_remark_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ob_remark_label.Location = new System.Drawing.Point(345, 79);
+            this.ob_remark_label.Location = new System.Drawing.Point(345, 74);
             this.ob_remark_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ob_remark_label.Name = "ob_remark_label";
             this.ob_remark_label.Size = new System.Drawing.Size(52, 27);
@@ -218,12 +219,12 @@
             this.panel1.Location = new System.Drawing.Point(33, 162);
             this.panel1.Margin = new System.Windows.Forms.Padding(4);
             this.panel1.Name = "panel1";
-            this.panel1.Size = new System.Drawing.Size(993, 124);
+            this.panel1.Size = new System.Drawing.Size(993, 120);
             this.panel1.TabIndex = 193;
             // 
             // ad_qty
             // 
-            this.ad_qty.Location = new System.Drawing.Point(100, 79);
+            this.ad_qty.Location = new System.Drawing.Point(100, 74);
             this.ad_qty.Margin = new System.Windows.Forms.Padding(4);
             this.ad_qty.Name = "ad_qty";
             this.ad_qty.Size = new System.Drawing.Size(204, 25);
@@ -235,7 +236,7 @@
             // 
             this.ad_qty_label.AutoSize = true;
             this.ad_qty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ad_qty_label.Location = new System.Drawing.Point(16, 79);
+            this.ad_qty_label.Location = new System.Drawing.Point(16, 74);
             this.ad_qty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ad_qty_label.Name = "ad_qty_label";
             this.ad_qty_label.Size = new System.Drawing.Size(72, 27);
@@ -247,7 +248,7 @@
             this.ob_remark.AllPower = null;
             this.ob_remark.BackColor = System.Drawing.Color.White;
             this.ob_remark.ID = null;
-            this.ob_remark.Location = new System.Drawing.Point(585, 79);
+            this.ob_remark.Location = new System.Drawing.Point(585, 74);
             this.ob_remark.Margin = new System.Windows.Forms.Padding(4);
             this.ob_remark.Name = "ob_remark";
             this.ob_remark.Power = null;
@@ -360,7 +361,7 @@
             this.Clean.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.Clean.Image = ((System.Drawing.Image)(resources.GetObject("Clean.Image")));
             this.Clean.IsShowBorder = true;
-            this.Clean.Location = new System.Drawing.Point(1145, 720);
+            this.Clean.Location = new System.Drawing.Point(1145, 729);
             this.Clean.Margin = new System.Windows.Forms.Padding(4);
             this.Clean.MoveImage = ((System.Drawing.Image)(resources.GetObject("Clean.MoveImage")));
             this.Clean.Name = "Clean";
@@ -402,7 +403,7 @@
             this.Save.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.Save.Image = ((System.Drawing.Image)(resources.GetObject("Save.Image")));
             this.Save.IsShowBorder = true;
-            this.Save.Location = new System.Drawing.Point(490, 720);
+            this.Save.Location = new System.Drawing.Point(490, 729);
             this.Save.Margin = new System.Windows.Forms.Padding(4);
             this.Save.MoveImage = ((System.Drawing.Image)(resources.GetObject("Save.MoveImage")));
             this.Save.Name = "Save";
@@ -561,11 +562,21 @@
             this.ms_sncode.Tag = "NoAuto";
             this.ms_sncode.KeyDown += new System.Windows.Forms.KeyEventHandler(this.ms_sncode_KeyDown);
             // 
+            // ChooseAll
+            // 
+            this.ChooseAll.Location = new System.Drawing.Point(33, 287);
+            this.ChooseAll.Name = "ChooseAll";
+            this.ChooseAll.Size = new System.Drawing.Size(56, 23);
+            this.ChooseAll.TabIndex = 194;
+            this.ChooseAll.Text = "全选";
+            this.ChooseAll.UseVisualStyleBackColor = true;
+            // 
             // OQC_PlanMaintain
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(1363, 781);
+            this.Controls.Add(this.ChooseAll);
             this.Controls.Add(this.panel1);
             this.Controls.Add(this.pr_detail);
             this.Controls.Add(this.pr_detail_label);
@@ -643,5 +654,6 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn ci_id;
         private System.Windows.Forms.DataGridViewTextBoxColumn ci_kind;
         private System.Windows.Forms.DataGridViewTextBoxColumn oi_sampleqty;
+        private CustomControl.ButtonUtil.ChooseAllButton ChooseAll;
     }
 }

UAS-MES/FunctionCode/OQC/OQC_PlanMaintain.resx

@@ -526,19 +526,4 @@
   <metadata name="oi_sampleqty.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="Choose.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="oi_id.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="ci_id.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="ci_kind.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="oi_sampleqty.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
 </root>

UAS-MES/UAS-MES.csproj

@@ -40,7 +40,7 @@
     <MinimumRequiredVersion>1.0.0.201</MinimumRequiredVersion>
     <WebPage>publish.htm</WebPage>
     <OpenBrowserOnPublish>false</OpenBrowserOnPublish>
-    <ApplicationRevision>265</ApplicationRevision>
+    <ApplicationRevision>266</ApplicationRevision>
     <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
     <UseApplicationTrust>true</UseApplicationTrust>
     <CreateDesktopShortcut>true</CreateDesktopShortcut>
@@ -397,6 +397,7 @@
       <DependentUpon>DbFind.cs</DependentUpon>
     </Compile>
     <Compile Include="Entity\ItemObject.cs" />
+    <Compile Include="Entity\Status.cs" />
     <Compile Include="Entity\SystemInf.cs" />
     <Compile Include="Entity\User.cs" />
     <Compile Include="Enum\EMouseState.cs" />