Merge branch 'master' of http://101.37.171.70:10101/r/YTWJ

jingh

2022-02-23 be4d75c7b69a94ef17d43290fdc923b4fe24fef0

 NETERP/NETERP.csproj

@@ -15,7 +15,7 @@
    <UpgradeBackupLocation>
    </UpgradeBackupLocation>
    <OldToolsVersion>2.0</OldToolsVersion>
    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
    <TargetFrameworkProfile />
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -52,16 +52,34 @@
    <ErrorReport>prompt</ErrorReport>
  </PropertyGroup>
  <ItemGroup>
    <Reference Include="AxInterop.grdes6Lib">
      <HintPath>..\DLL\AxInterop.grdes6Lib.dll</HintPath>
    </Reference>
    <Reference Include="AxInterop.gregn6Lib">
      <HintPath>..\DLL\AxInterop.gregn6Lib.dll</HintPath>
    </Reference>
    <Reference Include="DBUtility, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
      <HintPath>..\DLL\DBUtility.dll</HintPath>
    </Reference>
    <Reference Include="Interop.Excel, Version=1.5.0.0, Culture=neutral, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
      <HintPath>bin\Debug\Interop.Excel.dll</HintPath>
    <Reference Include="Interop.Excel">
      <HintPath>..\DLL\Interop.Excel.dll</HintPath>
      <EmbedInteropTypes>True</EmbedInteropTypes>
    </Reference>
    <Reference Include="OAM, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL" />
    <Reference Include="PlanM, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL" />
    <Reference Include="Interop.grdes6Lib">
      <HintPath>..\DLL\Interop.grdes6Lib.dll</HintPath>
      <EmbedInteropTypes>True</EmbedInteropTypes>
    </Reference>
    <Reference Include="Interop.gregn6Lib">
      <HintPath>..\DLL\Interop.gregn6Lib.dll</HintPath>
      <EmbedInteropTypes>True</EmbedInteropTypes>
    </Reference>
    <Reference Include="OAM">
      <HintPath>..\DLL\OAM.dll</HintPath>
    </Reference>
    <Reference Include="PlanM">
      <HintPath>..\DLL\PlanM.dll</HintPath>
    </Reference>
    <Reference Include="Pub_Class, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
      <HintPath>..\DLL\Pub_Class.dll</HintPath>
@@ -80,7 +98,9 @@
    <Reference Include="System.Drawing" />
    <Reference Include="System.Windows.Forms" />
    <Reference Include="System.Xml" />
    <Reference Include="WorkM, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL" />
    <Reference Include="TeeChart">
      <HintPath>..\DLL\TeeChart.dll</HintPath>
    </Reference>
  </ItemGroup>
  <ItemGroup>
    <Compile Include="公用\OA_MessageBox.cs">
@@ -200,38 +220,6 @@
    <Content Include="总控台.ico" />
  </ItemGroup>
  <ItemGroup>
    <COMReference Include="Axgrdes6Lib">
      <Guid>{C5A16330-A084-48C9-BC0F-0D0B37A14123}</Guid>
      <VersionMajor>6</VersionMajor>
      <VersionMinor>0</VersionMinor>
      <Lcid>0</Lcid>
      <WrapperTool>aximp</WrapperTool>
      <Isolated>False</Isolated>
    </COMReference>
    <COMReference Include="Axgregn6Lib">
      <Guid>{4018F953-1BFE-441E-8A04-DC8BA1FF060E}</Guid>
      <VersionMajor>6</VersionMajor>
      <VersionMinor>0</VersionMinor>
      <Lcid>0</Lcid>
      <WrapperTool>aximp</WrapperTool>
      <Isolated>False</Isolated>
    </COMReference>
    <COMReference Include="grdes6Lib">
      <Guid>{C5A16330-A084-48C9-BC0F-0D0B37A14123}</Guid>
      <VersionMajor>6</VersionMajor>
      <VersionMinor>0</VersionMinor>
      <Lcid>0</Lcid>
      <WrapperTool>tlbimp</WrapperTool>
      <Isolated>False</Isolated>
    </COMReference>
    <COMReference Include="gregn6Lib">
      <Guid>{4018F953-1BFE-441E-8A04-DC8BA1FF060E}</Guid>
      <VersionMajor>6</VersionMajor>
      <VersionMinor>0</VersionMinor>
      <Lcid>0</Lcid>
      <WrapperTool>tlbimp</WrapperTool>
      <Isolated>False</Isolated>
    </COMReference>
    <COMReference Include="stdole">
      <Guid>{00020430-0000-0000-C000-000000000046}</Guid>
      <VersionMajor>2</VersionMajor>