SANJIAPI.git - Gitblit

parent: f9c03055 | 补丁 | 提交 | ignore whitespace

Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

zgq

2021-08-25 5ce46695b7fac99ee74bee09f9a6424b3346c818

Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

5个文件已修改

	BLL/BLL.csproj	12 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	BaseSet/BaseSet.csproj	23 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	PlanM/PlanM.csproj	23 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ProM/ProM.csproj	23 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WarM/WarM.csproj	23 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 BLL/BLL.csproj

@@ -67,6 +67,10 @@
    <ErrorReport>prompt</ErrorReport>
  </PropertyGroup>
  <ItemGroup>
    <Reference Include="Interop.gregn6Lib">
      <HintPath>..\OCX\Interop.gregn6Lib.dll</HintPath>
      <EmbedInteropTypes>True</EmbedInteropTypes>
    </Reference>
    <Reference Include="Kingdee.BOS.WebApi.Client">
      <HintPath>..\OCX\Kingdee.BOS.WebApi.Client.dll</HintPath>
    </Reference>
@@ -559,14 +563,6 @@
      <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">

 BaseSet/BaseSet.csproj

@@ -68,6 +68,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="NPOI, Version=2.1.3.1, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
      <HintPath>..\OCX\NPOI.dll</HintPath>
@@ -1547,22 +1554,6 @@
    </Compile>
  </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>

 PlanM/PlanM.csproj

@@ -67,6 +67,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="NPOI, Version=2.1.3.1, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
      <HintPath>..\OCX\NPOI.dll</HintPath>
@@ -208,22 +215,6 @@
    </Compile>
  </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,6 +67,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" />
@@ -498,24 +505,8 @@
      <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>

 WarM/WarM.csproj

@@ -67,6 +67,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="NPOI, Version=2.1.3.1, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
      <HintPath>..\OCX\NPOI.dll</HintPath>
@@ -682,22 +689,6 @@
    </Compile>
  </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>

			@@ -67,6 +67,10 @@
			<ErrorReport>prompt</ErrorReport>
			</PropertyGroup>
			<ItemGroup>
			<Reference Include="Interop.gregn6Lib">
			<HintPath>..\OCX\Interop.gregn6Lib.dll</HintPath>
			<EmbedInteropTypes>True</EmbedInteropTypes>
			</Reference>
			<Reference Include="Kingdee.BOS.WebApi.Client">
			<HintPath>..\OCX\Kingdee.BOS.WebApi.Client.dll</HintPath>
			</Reference>
			@@ -559,14 +563,6 @@
			<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">

			@@ -68,6 +68,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="NPOI, Version=2.1.3.1, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
			<SpecificVersion>False</SpecificVersion>
			<HintPath>..\OCX\NPOI.dll</HintPath>
			@@ -1547,22 +1554,6 @@
			</Compile>
			</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>

			@@ -67,6 +67,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="NPOI, Version=2.1.3.1, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
			<SpecificVersion>False</SpecificVersion>
			<HintPath>..\OCX\NPOI.dll</HintPath>
			@@ -208,22 +215,6 @@
			</Compile>
			</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>