From b2faba41f3dba638713b7a2a95901cc9357016d8 Mon Sep 17 00:00:00 2001 From: yangle <admin@YINMOU> Date: 星期一, 19 八月 2024 13:59:49 +0800 Subject: [PATCH] 1 --- WebAPI/WebAPI.csproj | 26 ++++++++++++++++++++++---- 1 files changed, 22 insertions(+), 4 deletions(-) diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj index 69fe3ef..ac0fdfc 100644 --- a/WebAPI/WebAPI.csproj +++ b/WebAPI/WebAPI.csproj @@ -46,8 +46,8 @@ <Prefer32Bit>false</Prefer32Bit> </PropertyGroup> <ItemGroup> - <Reference Include="Aliyun.Credentials, Version=1.3.2.0, Culture=neutral, processorArchitecture=MSIL"> - <HintPath>..\packages\Aliyun.Credentials.1.3.2\lib\net45\Aliyun.Credentials.dll</HintPath> + <Reference Include="Aliyun.Credentials, Version=1.4.0.0, Culture=neutral, processorArchitecture=MSIL"> + <HintPath>..\packages\Aliyun.Credentials.1.4.0\lib\net45\Aliyun.Credentials.dll</HintPath> </Reference> <Reference Include="Antlr3.Runtime, Version=3.4.1.9004, Culture=neutral, PublicKeyToken=eb42632606e9261f, processorArchitecture=MSIL"> <HintPath>..\packages\Antlr.3.4.1.9004\lib\Antlr3.Runtime.dll</HintPath> @@ -83,8 +83,8 @@ <HintPath>..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath> <Private>True</Private> </Reference> - <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL"> - <HintPath>..\packages\Newtonsoft.Json.6.0.5\lib\net45\Newtonsoft.Json.dll</HintPath> + <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL"> + <HintPath>..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath> </Reference> <Reference Include="NPOI, Version=2.5.5.0, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL"> <HintPath>..\packages\NPOI.2.5.5\lib\net45\NPOI.dll</HintPath> @@ -223,6 +223,9 @@ <Reference Include="System.Xml.Linq"> <Private>True</Private> </Reference> + <Reference Include="Tea, Version=1.1.3.0, Culture=neutral, processorArchitecture=MSIL"> + <HintPath>..\packages\Tea.1.1.3\lib\net45\Tea.dll</HintPath> + </Reference> <Reference Include="WebActivatorEx, Version=2.0.0.0, Culture=neutral, PublicKeyToken=7b26dc2a43f6a0d4, processorArchitecture=MSIL"> <HintPath>..\packages\WebActivatorEx.2.0.6\lib\net40\WebActivatorEx.dll</HintPath> <Private>True</Private> @@ -252,6 +255,7 @@ <Content Include="Views\Scripts\bootstrap.min.js" /> <Content Include="Config\kdapi.config" /> <Content Include="libman.json" /> + <None Include="Properties\PublishProfiles\FolderProfilewtt.pubxml" /> <None Include="Properties\Settings.settings"> <Generator>SettingsSingleFileGenerator</Generator> <LastGenOutput>Settings.Designer.cs</LastGenOutput> @@ -662,6 +666,7 @@ <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_RepairCheckBillController.cs" /> <Compile Include="Controllers\鍩虹璧勬枡\宸ヨ祫鍩虹璧勬枡\Gy_ProcPriceController.cs" /> <Compile Include="Controllers\搴旀敹绠$悊\YS_ReceiveReportController.cs" /> + <Compile Include="Controllers\鏁版嵁鍚屾\閽夐拤鍚屾\DD_DataSynchronizationController.cs" /> <Compile Include="Controllers\鏉$爜绠$悊\MouldController.cs" /> <Compile Include="Controllers\鏉$爜绠$悊\WEBSController.cs" /> <Compile Include="Controllers\鐢熶骇绠$悊\鎶ュ伐鍙板伐搴廫Sc_MaterToSourceStepBillController.cs" /> @@ -686,6 +691,7 @@ <Compile Include="Dapper\SqlPools.cs" /> <Compile Include="DbUntil\DataFormatUntil.cs" /> <Compile Include="DLL\ClsGy_BadPhenomena_Ctl.cs" /> + <Compile Include="DLL\ClsGy_TechnologyParameterType_Ctl.cs" /> <Compile Include="DLL\ClsGy_InspectInstruMent_Ctl.cs" /> <Compile Include="DLL\ClsGy_InspectBasis_Ctl.cs" /> <Compile Include="DLL\ClsGy_CheckNoteItem_Ctl.cs" /> @@ -732,6 +738,7 @@ <Compile Include="DLL\ClsSb_EquipMaintainRuleBill.cs" /> <Compile Include="DLL\ClsSb_EquipRepairCheckBill.cs" /> <Compile Include="DLL\ClsSb_EquipRepairSendWorkBill.cs" /> + <Compile Include="DLL\ClsSb_EquipRepairSignBill.cs" /> <Compile Include="DLL\ClsSb_EquipRepairWorkBill.cs" /> <Compile Include="DLL\ClsSb_MouldRepairWorkBill.cs" /> <Compile Include="DLL\ClsSc_ICMOBillWorkQtyStatus_Tmp.cs" /> @@ -765,6 +772,8 @@ <Compile Include="Models\ClsGy_SupMaterial.cs" /> <Compile Include="Models\ClsGy_EquipFileBillSub_DotCheckRule.cs" /> <Compile Include="Models\ClsGy_EquipFileBillSub_MaintainRule.cs" /> + <Compile Include="Models\ClsSb_EquipRepairSignBillMain.cs" /> + <Compile Include="Models\ClsSb_EquipRepairSignBillSub.cs" /> <Compile Include="Models\ClsSc_AssemblyBillMain.cs" /> <Compile Include="Models\ClsSc_AssemblyBillSub.cs" /> <Compile Include="Models\ClsSc_MESBeginWorkBillSub_RelationBill.cs" /> @@ -1199,6 +1208,10 @@ <Project>{f7838319-779c-4ad9-a59f-5dcb5757f335}</Project> <Name>Pub_Control</Name> </ProjectReference> + <ProjectReference Include="..\sdk_dingding\TopSdk\TopSdk.csproj"> + <Project>{9c11cae5-5188-4e71-825b-68fc3135728a}</Project> + <Name>TopSdk</Name> + </ProjectReference> <ProjectReference Include="..\SQLHelper\SQLHelper.csproj"> <Project>{0a4ef483-d8d3-49a5-8378-974ef7993365}</Project> <Name>SQLHelper</Name> @@ -1261,6 +1274,11 @@ <Error Condition="!Exists('..\packages\Grpc.Core.2.45.0\build\net45\Grpc.Core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Grpc.Core.2.45.0\build\net45\Grpc.Core.targets'))" /> </Target>--> <Import Project="..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets" Condition="Exists('..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" /> + <Import Project="..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets" Condition="Exists('..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" /> + <Target Name="EnsureBclBuildImported" BeforeTargets="BeforeBuild" Condition="'$(BclBuildImported)' == ''"> + <Error Condition="!Exists('..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" Text="This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=317567." HelpKeyword="BCLBUILD2001" /> + <Error Condition="Exists('..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" Text="The build restored NuGet packages. Build the project again to include these packages in the build. For more information, see http://go.microsoft.com/fwlink/?LinkID=317568." HelpKeyword="BCLBUILD2002" /> + </Target> <!--<Target Name="EnsureBclBuildImported" BeforeTargets="BeforeBuild" Condition="'$(BclBuildImported)' == ''"> <Error Condition="!Exists('..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" Text="This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=317567." HelpKeyword="BCLBUILD2001" /> <Error Condition="Exists('..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" Text="The build restored NuGet packages. Build the project again to include these packages in the build. For more information, see http://go.microsoft.com/fwlink/?LinkID=317568." HelpKeyword="BCLBUILD2002" /> -- Gitblit v1.9.1