From 9967a08d57b74daefa44ead22f6c0ed72dfadea0 Mon Sep 17 00:00:00 2001
From: yxj <yxj@hz-kingdee.com>
Date: 星期四, 16 四月 2026 11:18:29 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/WebAPI.csproj | 24 +++++++++++++++++++++---
1 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index 1a3aea8..71e6f72 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -123,6 +123,15 @@
<Reference Include="Microsoft.CSharp">
<Private>True</Private>
</Reference>
+ <Reference Include="Microsoft.IdentityModel.JsonWebTokens, Version=5.7.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+ <HintPath>..\packages\Microsoft.IdentityModel.JsonWebTokens.5.7.0\lib\net45\Microsoft.IdentityModel.JsonWebTokens.dll</HintPath>
+ </Reference>
+ <Reference Include="Microsoft.IdentityModel.Logging, Version=5.7.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+ <HintPath>..\packages\Microsoft.IdentityModel.Logging.5.7.0\lib\net45\Microsoft.IdentityModel.Logging.dll</HintPath>
+ </Reference>
+ <Reference Include="Microsoft.IdentityModel.Tokens, Version=5.7.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+ <HintPath>..\packages\Microsoft.IdentityModel.Tokens.5.7.0\lib\net45\Microsoft.IdentityModel.Tokens.dll</HintPath>
+ </Reference>
<Reference Include="Microsoft.Owin, Version=4.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Owin.4.0.1\lib\net45\Microsoft.Owin.dll</HintPath>
</Reference>
@@ -171,9 +180,8 @@
<Reference Include="System.Data.DataSetExtensions">
<Private>True</Private>
</Reference>
- <Reference Include="System.IdentityModel.Tokens.Jwt, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
- <HintPath>..\packages\System.IdentityModel.Tokens.Jwt.4.0.0\lib\net45\System.IdentityModel.Tokens.Jwt.dll</HintPath>
- <Private>True</Private>
+ <Reference Include="System.IdentityModel.Tokens.Jwt, Version=5.7.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+ <HintPath>..\packages\System.IdentityModel.Tokens.Jwt.5.7.0\lib\net45\System.IdentityModel.Tokens.Jwt.dll</HintPath>
</Reference>
<Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Memory.4.5.3\lib\netstandard1.1\System.Memory.dll</HintPath>
@@ -323,6 +331,7 @@
<Content Include="Config\kdapi.config" />
<Content Include="libman.json" />
<Content Include="Template\barCodeTemplateStorage.json" />
+ <None Include="Properties\PublishProfiles\CHZFolderProfile.pubxml" />
<None Include="Properties\PublishProfiles\JFAPI.pubxml" />
<None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
@@ -512,6 +521,7 @@
<Compile Include="Controllers\SCGL\Sc_ProductionCycleBillController.cs" />
<Compile Include="Controllers\SCGL\Sc_MESStopRestoreWorkBillController.cs" />
<Compile Include="Controllers\SCGL\Sc_RepairCodeBindingController.cs" />
+ <Compile Include="Controllers\SCGL\Sc_FeedingErrorProofingBillController.cs" />
<Compile Include="Controllers\SCGL\鏃ヨ鍒掔鐞哱JIT_DayPlanPlatFormBill_TKController.cs" />
<Compile Include="Controllers\SCGL\鏃ヨ鍒掔鐞哱Xs_SendGoodsPlanBillController.cs" />
<Compile Include="Controllers\WLGL\Cg_CarTrajectoryBillController.cs" />
@@ -675,6 +685,7 @@
<Compile Include="Controllers\鍝佽川绠＄悊\杞﹂棿鑷鍗昞QC_WorkSelfCheckBillController.cs" />
<Compile Include="Controllers\鍗庤繙datamapping\Gy_BarCodeBill_PNL_TempController.cs" />
<Compile Include="Controllers\鍗庤繙datamapping\Gy_BarCodeBill_Set_TempController.cs" />
+ <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Cb_OtherOutBill_CostSubjectDetailController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_AssistantDataEntryController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_BilloriginController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_CostAverageTypeController.cs" />
@@ -985,6 +996,7 @@
<Compile Include="Models\Gy_RoutingBillSub_WorkQty.cs" />
<Compile Include="Models\ClsQC_CheckNote_PNL_Temp.cs" />
<Compile Include="Models\Gy_TechnologyParameterSub.cs" />
+ <Compile Include="Models\KingdeeResponse.cs" />
<Compile Include="Models\QC_OutCompCheckBillSub_ValueGrid.cs" />
<Compile Include="Models\Sc_StationOutBillSub_Sup.cs" />
<Compile Include="Models\Gy_MateNumRelation_Sec.cs" />
@@ -992,6 +1004,7 @@
<Compile Include="Models\ClsQC_RequestCheckBillSub.cs" />
<Compile Include="Models\WorkStationSub.cs" />
<Compile Include="Models\Xs_SendGoodsPlanBillMain.cs" />
+ <Compile Include="Models\Xt_CheckFlowSub_Proc.cs" />
<Compile Include="Models\鍩虹璧勬枡\ClsGy_EmployeeSub.cs" />
<Compile Include="Models\鍩虹璧勬枡\Gy_ColorClass.cs" />
<Compile Include="Models\Employee.cs" />
@@ -1231,6 +1244,7 @@
<DependentUpon>Settings.settings</DependentUpon>
</Compile>
<Compile Include="Service\GeTuiService.cs" />
+ <Compile Include="Service\JwtAuthorizeAttribute.cs" />
<Compile Include="Service\LuBaoSevice.cs" />
<Compile Include="Service\ProcessDal.cs" />
<Compile Include="Service\YqnDal.cs" />
@@ -1238,7 +1252,10 @@
<Compile Include="Utility\Barcode.ashx.cs">
<DependentUpon>Barcode.ashx</DependentUpon>
</Compile>
+ <Compile Include="Utility\JWTHelper.cs" />
+ <Compile Include="Utility\PermissionAttribute.cs" />
<Compile Include="Utility\ServerTools.cs" />
+ <Compile Include="Service\TokenAppendHandler.cs" />
<Compile Include="Utility\Util.cs" />
<Compile Include="Code\Common.cs" />
<Compile Include="Code\Test2.cs" />
@@ -1305,6 +1322,7 @@
<Folder Include="Controllers\椤圭洰绠＄悊\鍩虹寤烘ā\" />
<Folder Include="DLL\SBGL\SBBB\" />
<Folder Include="obj\x86\Debug\" />
+ <Folder Include="Views\Cb_OtherOutBill_CostSubjectDetail\" />
<Folder Include="Views\CB_WipProcessTable\" />
<Folder Include="Views\Cg_ContractTransportBillList\" />
<Folder Include="Views\Cg_PODemandPlanBill\" />
--
Gitblit v1.9.1