接口项目提交

UAS_CustomerInterface/MesHelper.cs

@@ -549,9 +549,9 @@ namespace UAS.MES
                 return false;
             }
             oErrMessage = "";
-            sql.Length = 0;
             string omakeCode;
             GetRcardMOInfo(iSN, out omakeCode, out oErrMessage);
+            sql.Clear();
             sql.Append("begin ");
             for (int i = 0; i < iTestDetail.Length; i++)
             {
@@ -624,7 +624,7 @@ namespace UAS.MES
             oErrMessage = param[6];
             omakecode = param[4];
             if (oErrMessage == "" || oErrMessage == null || oErrMessage == "null")
-                return SetStepFinish(omakecode, iResCode, iSN, iOperator, iResult, "", iErrCode, out oErrMessage);
+                return SetStepFinish(omakecode, iResCode, iSN, "", iResult, iOperator, iErrCode, out oErrMessage);
             else
                 return false;
         }

UAS_CustomerInterface/Properties/AssemblyInfo.cs

@@ -17,7 +17,7 @@ using System.Runtime.InteropServices;
 //将 ComVisible 设置为 false 将使此程序集中的类型
 //对 COM 组件不可见。  如果需要从 COM 访问此程序集中的类型，
 //请将此类型的 ComVisible 特性设置为 true。
-[assembly: ComVisible(false)]
+[assembly: ComVisible(true)]
 
 // 如果此项目向 COM 公开，则下列 GUID 用于类型库的 ID
 [assembly: Guid("8ae749cc-b79d-4f46-b2eb-4fafd661bd97")]

UAS_CustomerInterface/UAS_CustomerInterface.csproj

@@ -8,7 +8,7 @@
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>UAS_CustomerInterface</RootNamespace>
-    <AssemblyName>UAS_MesHelper</AssemblyName>
+    <AssemblyName>UAS.MES</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
@@ -30,6 +30,12 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
+  <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="Oracle.ManagedDataAccess">
       <HintPath>tool\Oracle.ManagedDataAccess.dll</HintPath>
@@ -40,13 +46,16 @@
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Data" />
-    <Reference Include="System.Net.Http" />
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="MesHelper.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="key.pfx" />
+    <None Include="key.snk" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.