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

UAS-MES/FunctionCode/Make/Make_TestCollection.cs

@@ -608,11 +608,7 @@ namespace UAS_MES.Make
         {
             if (ma_code.Text.Length > 4)
             {
-                mcd_remainqty.Text = "";
-                mcd_inqty.Text = "";
-                ob_batchqty.Text = "";
-                ob_nowcheckqty.Text = "";
-                ob_sendqty.Text = "";
+                LoadBadGroupData();
                 LoadCollectedNum();
                 LoadCheckQTY();
             }

UAS-MES/UAS-MES.csproj

@@ -81,7 +81,7 @@
     <GenerateManifests>true</GenerateManifests>
   </PropertyGroup>
   <PropertyGroup>
-    <SignManifests>false</SignManifests>
+    <SignManifests>true</SignManifests>
   </PropertyGroup>
   <PropertyGroup>
     <StartupObject>UAS_MES.Program</StartupObject>
@@ -343,12 +343,6 @@
     <Compile Include="CustomControl\TextBoxWithIcon\SearchTextBox.Designer.cs">
       <DependentUpon>SearchTextBox.cs</DependentUpon>
     </Compile>
-    <Compile Include="CustomControl\TextBoxWithIcon\SNCodeEnterTextBox.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="CustomControl\TextBoxWithIcon\SNCodeEnterTextBox.Designer.cs">
-      <DependentUpon>SNCodeEnterTextBox.cs</DependentUpon>
-    </Compile>
     <Compile Include="CustomControl\TextBoxWithIcon\TextAreaForm.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -875,9 +869,6 @@
     <EmbeddedResource Include="CustomControl\TextBoxWithIcon\SearchTextBox.resx">
       <DependentUpon>SearchTextBox.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="CustomControl\TextBoxWithIcon\SNCodeEnterTextBox.resx">
-      <DependentUpon>SNCodeEnterTextBox.cs</DependentUpon>
-    </EmbeddedResource>
     <EmbeddedResource Include="CustomControl\TextBoxWithIcon\TextAreaForm.resx">
       <DependentUpon>TextAreaForm.cs</DependentUpon>
     </EmbeddedResource>