合并分支

chenhaozhe

2026-04-16 82b57de13d9449c48944db91d7f17b477169c324

 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>
@@ -676,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" />
@@ -994,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" />
@@ -1233,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" />
@@ -1240,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" />
@@ -1307,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\" />