parent: 76e376b2 | 补丁 | 提交 | ignore whitespace
zgq
2021-08-25 c9b292915996bc094a2369e4f34831b25b13a1ef 
Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
8个文件已修改
230 ■■■■■ 已修改文件
APSM/APSM.csproj 23 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
EAM/EAM.csproj 23 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Kanban/Kanban.csproj 23 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
OAM/OAM.csproj 23 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ProM/ProM.csproj 23 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
SCM/SCM.csproj 23 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
SelM/SelM.csproj 46 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WorkM/WorkM.csproj 46 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 APSM/APSM.csproj


@@ -49,6 +49,13 @@


    <ErrorReport>prompt</ErrorReport>


  </PropertyGroup>


  <ItemGroup>


    <Reference Include="AxInterop.gregn6Lib">


      <HintPath>..\OCX\AxInterop.gregn6Lib.dll</HintPath>


    </Reference>


    <Reference Include="Interop.gregn6Lib">


      <HintPath>..\OCX\Interop.gregn6Lib.dll</HintPath>


      <EmbedInteropTypes>True</EmbedInteropTypes>


    </Reference>


    <Reference Include="System" />


    <Reference Include="System.Data" />


    <Reference Include="System.Drawing" />


@@ -614,22 +621,6 @@


    </EmbeddedResource>


  </ItemGroup>


  <ItemGroup>


    <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="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>




 EAM/EAM.csproj


@@ -59,6 +59,13 @@


    <OutputPath>bin\x86\Release\</OutputPath>


  </PropertyGroup>


  <ItemGroup>


    <Reference Include="AxInterop.gregn6Lib">


      <HintPath>..\OCX\AxInterop.gregn6Lib.dll</HintPath>


    </Reference>


    <Reference Include="Interop.gregn6Lib">


      <HintPath>..\OCX\Interop.gregn6Lib.dll</HintPath>


      <EmbedInteropTypes>True</EmbedInteropTypes>


    </Reference>


    <Reference Include="System" />


    <Reference Include="System.Data" />


    <Reference Include="System.Drawing" />


@@ -1228,22 +1235,6 @@


    </ProjectReference>


  </ItemGroup>


  <ItemGroup>


    <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="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>




 Kanban/Kanban.csproj


@@ -59,6 +59,13 @@


    <OutputPath>bin\x86\Release\</OutputPath>


  </PropertyGroup>


  <ItemGroup>


    <Reference Include="AxInterop.gregn6Lib">


      <HintPath>..\OCX\AxInterop.gregn6Lib.dll</HintPath>


    </Reference>


    <Reference Include="Interop.gregn6Lib">


      <HintPath>..\OCX\Interop.gregn6Lib.dll</HintPath>


      <EmbedInteropTypes>True</EmbedInteropTypes>


    </Reference>


    <Reference Include="System" />


    <Reference Include="System.Data" />


    <Reference Include="System.Drawing" />


@@ -435,22 +442,6 @@


    </EmbeddedResource>


  </ItemGroup>


  <ItemGroup>


    <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="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>




 OAM/OAM.csproj


@@ -68,6 +68,13 @@


    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>


  </PropertyGroup>


  <ItemGroup>


    <Reference Include="AxInterop.gregn6Lib">


      <HintPath>..\OCX\AxInterop.gregn6Lib.dll</HintPath>


    </Reference>


    <Reference Include="Interop.gregn6Lib">


      <HintPath>..\OCX\Interop.gregn6Lib.dll</HintPath>


      <EmbedInteropTypes>True</EmbedInteropTypes>


    </Reference>


    <Reference Include="System" />


    <Reference Include="System.Data" />


    <Reference Include="System.Drawing" />


@@ -1095,22 +1102,6 @@


    </ProjectReference>


  </ItemGroup>


  <ItemGroup>


    <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="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>




 ProM/ProM.csproj


@@ -67,8 +67,15 @@


    <ErrorReport>prompt</ErrorReport>


  </PropertyGroup>


  <ItemGroup>


    <Reference Include="AxInterop.grdes6Lib">


      <HintPath>..\OCX\AxInterop.grdes6Lib.dll</HintPath>


    </Reference>


    <Reference Include="AxInterop.gregn6Lib">


      <HintPath>..\OCX\AxInterop.gregn6Lib.dll</HintPath>


    </Reference>


    <Reference Include="Interop.grdes6Lib">


      <HintPath>..\OCX\Interop.grdes6Lib.dll</HintPath>


      <EmbedInteropTypes>True</EmbedInteropTypes>


    </Reference>


    <Reference Include="Interop.gregn6Lib">


      <HintPath>..\OCX\Interop.gregn6Lib.dll</HintPath>


@@ -497,22 +504,6 @@


    </EmbeddedResource>


  </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="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="stdole">


      <Guid>{00020430-0000-0000-C000-000000000046}</Guid>


      <VersionMajor>2</VersionMajor>




 SCM/SCM.csproj


@@ -68,6 +68,13 @@


    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>


  </PropertyGroup>


  <ItemGroup>


    <Reference Include="AxInterop.gregn6Lib">


      <HintPath>..\OCX\AxInterop.gregn6Lib.dll</HintPath>


    </Reference>


    <Reference Include="Interop.gregn6Lib">


      <HintPath>..\OCX\Interop.gregn6Lib.dll</HintPath>


      <EmbedInteropTypes>True</EmbedInteropTypes>


    </Reference>


    <Reference Include="System" />


    <Reference Include="System.Data" />


    <Reference Include="System.Drawing" />


@@ -435,22 +442,6 @@


    </EmbeddedResource>


  </ItemGroup>


  <ItemGroup>


    <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="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>




 SelM/SelM.csproj


@@ -67,6 +67,20 @@


    <ErrorReport>prompt</ErrorReport>


  </PropertyGroup>


  <ItemGroup>


    <Reference Include="AxInterop.grdes6Lib">


      <HintPath>..\OCX\AxInterop.grdes6Lib.dll</HintPath>


    </Reference>


    <Reference Include="AxInterop.gregn6Lib">


      <HintPath>..\OCX\AxInterop.gregn6Lib.dll</HintPath>


    </Reference>


    <Reference Include="Interop.grdes6Lib">


      <HintPath>..\OCX\Interop.grdes6Lib.dll</HintPath>


      <EmbedInteropTypes>True</EmbedInteropTypes>


    </Reference>


    <Reference Include="Interop.gregn6Lib">


      <HintPath>..\OCX\Interop.gregn6Lib.dll</HintPath>


      <EmbedInteropTypes>True</EmbedInteropTypes>


    </Reference>


    <Reference Include="System" />


    <Reference Include="System.Data" />


    <Reference Include="System.Drawing" />


@@ -357,38 +371,6 @@


    </Compile>


  </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>




 WorkM/WorkM.csproj


@@ -67,6 +67,20 @@


    <ErrorReport>prompt</ErrorReport>


  </PropertyGroup>


  <ItemGroup>


    <Reference Include="AxInterop.grdes6Lib">


      <HintPath>..\OCX\AxInterop.grdes6Lib.dll</HintPath>


    </Reference>


    <Reference Include="AxInterop.gregn6Lib">


      <HintPath>..\OCX\AxInterop.gregn6Lib.dll</HintPath>


    </Reference>


    <Reference Include="Interop.grdes6Lib">


      <HintPath>..\OCX\Interop.grdes6Lib.dll</HintPath>


      <EmbedInteropTypes>True</EmbedInteropTypes>


    </Reference>


    <Reference Include="Interop.gregn6Lib">


      <HintPath>..\OCX\Interop.gregn6Lib.dll</HintPath>


      <EmbedInteropTypes>True</EmbedInteropTypes>


    </Reference>


    <Reference Include="System" />


    <Reference Include="System.Data" />


    <Reference Include="System.Drawing" />


@@ -785,38 +799,6 @@


    </Compile>


  </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>