From 2fd658134344c18e9f2a2eb2c2099d0b0edf205a Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期三, 25 三月 2026 16:08:10 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/WebAPI.csproj | 40 +++++++++++++++++++++++++++++++---------
1 files changed, 31 insertions(+), 9 deletions(-)
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index fcd18d8..8ebef0a 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -123,8 +123,20 @@
<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>
+ <Reference Include="Microsoft.Owin.Cors, Version=4.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+ <HintPath>..\packages\Microsoft.Owin.Cors.4.0.1\lib\net45\Microsoft.Owin.Cors.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Owin.Host.SystemWeb, Version=4.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Owin.Host.SystemWeb.4.0.1\lib\net45\Microsoft.Owin.Host.SystemWeb.dll</HintPath>
@@ -168,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>
@@ -235,6 +246,9 @@
</Reference>
<Reference Include="System.Web.Http.Cors, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.AspNet.WebApi.Cors.5.2.7\lib\net45\System.Web.Http.Cors.dll</HintPath>
+ </Reference>
+ <Reference Include="System.Web.Http.Owin, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+ <HintPath>..\packages\Microsoft.AspNet.WebApi.Owin.5.2.3\lib\net45\System.Web.Http.Owin.dll</HintPath>
</Reference>
<Reference Include="System.Web.Http.WebHost, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
@@ -421,6 +435,7 @@
<Compile Include="Controllers\BaseSet\Pay_PeriodInfoSetController.cs" />
<Compile Include="Controllers\BaseSet\Gy_OrderBackInfoController.cs" />
<Compile Include="Controllers\BaseSet\Gy_OrderLevController.cs" />
+ <Compile Include="Controllers\BaseSet\Kf_WIPBalController.cs" />
<Compile Include="Controllers\BaseSet\Xt_DataDictionary_ProcController.cs" />
<Compile Include="Controllers\BaseSet\Xt_DataDictionary_TableController.cs" />
<Compile Include="Controllers\BaseSet\Gy_ModelTypeController.cs" />
@@ -487,6 +502,7 @@
<Compile Include="Controllers\CJGL\Sc_KeyElementBindingController.cs" />
<Compile Include="Controllers\CJGL\Sc_OEEReportController.cs" />
<Compile Include="Controllers\CKGL\TMZD\Gy_BarCodeBillListController.cs" />
+ <Compile Include="Controllers\Gy_MaterErrorPreventionController.cs" />
<Compile Include="Controllers\GZGL\Gy_SteppedPriceCoefficientController .cs" />
<Compile Include="Controllers\JHGL\Gy_SourceMouldBillController.cs" />
<Compile Include="Controllers\MJGL\Sc_MouldProdMoveBillController.cs" />
@@ -497,12 +513,14 @@
<Compile Include="Controllers\MJGL\Sc_MouldMoveStockRequestBillController.cs" />
<Compile Include="Controllers\MJGL\Gy_MaterialPackingRelationController.cs" />
<Compile Include="Controllers\QC_InStockCheckBillController.cs" />
+ <Compile Include="Controllers\SBGL\SBBB\Sb_EquipMentReportController.cs" />
<Compile Include="Controllers\SBGL\Sb_EquipPatrolCheckRuleBillController.cs" />
<Compile Include="Controllers\SBGL\Sb_EquipPatrolCheckPlanBillController.cs" />
<Compile Include="Controllers\SBGL\Sb_EquipPatrolCheckBillController.cs" />
<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" />
@@ -512,13 +530,12 @@
<Compile Include="Controllers\XSGL\Xs_SeQuotationBillController.cs" />
<Compile Include="Controllers\Xt_DefineBillMainSetController.cs" />
<Compile Include="Controllers\MJGL\Sc_MouldBatchWorkCheckBillController.cs" />
- <Compile Include="Controllers\SBGL\SBBB\Sb_EquipMentCollectionTechParamController.cs" />
- <Compile Include="Controllers\SBGL\SBBB\Sb_EquipMentCollectionTechParam_TempController.cs" />
<Compile Include="Controllers\SCGL\Sc_ProductionReportsController.cs" />
<Compile Include="Controllers\XSGL\Xs_OutDoorBillController.cs" />
<Compile Include="Controllers\ZLGL\BaseSet\Gy_InspectBasisController.cs" />
<Compile Include="Controllers\ZLGL\BaseSet\Gy_InspectMethodController.cs" />
<Compile Include="Controllers\ZLGL\BaseSet\Gy_QualityController.cs" />
+ <Compile Include="Controllers\ZWDBController.cs" />
<Compile Include="Controllers\浜轰簨绠＄悊\浜哄憳灞ュ巻\HR_PersonnelResumeController.cs" />
<Compile Include="Controllers\浠撳瓨绠＄悊\Kf_MoveStockBillController.cs" />
<Compile Include="Controllers\浠撳瓨绠＄悊\Sc_PackUnionBillMain_SettoPackingController.cs" />
@@ -706,6 +723,7 @@
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_CostItemFixRateController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_CostItemAverageTypeController.cs" />
<Compile Include="Controllers\鎴愭湰绠＄悊\CB_ItemMoneyBillController.cs" />
+ <Compile Include="Controllers\鎴愭湰绠＄悊\CB_ActualItemMoneyCostController.cs" />
<Compile Include="Controllers\鎴愭湰绠＄悊\CB_WipProcessTableController.cs" />
<Compile Include="Controllers\鎴愭湰绠＄悊\鎴愭湰璐圭敤璋冩暣鍗昞CB_ChangeMoneyBillController.cs" />
<Compile Include="Controllers\妫�楠岀敵璇峰崟\QC_RequestCheckBillController.cs" />
@@ -937,7 +955,6 @@
<Compile Include="DLL\ClsSc_PHPCruxBillBill.cs" />
<Compile Include="DLL\ClsSc_ProcessPlan.cs" />
<Compile Include="DLL\ClsWW_PPBomBill.cs" />
- <Compile Include="DLL\SBGL\SBBB\Sb_EquipMentCollectionTechParam_Ctl.cs" />
<Compile Include="DLL\宸ヨ祫绠＄悊\ClsPay_GroupBalBill.cs" />
<Compile Include="DLL\宸ヨ祫绠＄悊\ClsGy_GroupEmpBill.cs" />
<Compile Include="DLL\宸ヨ祫绠＄悊\ClsPay_WorkTimesBill.cs" />
@@ -976,13 +993,14 @@
<Compile Include="Models\Gy_MouldFileSub_SubMater.cs" />
<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\SBGL\SBBB\Sb_EquipMentCollectionTechParam_Temp.cs" />
- <Compile Include="Models\SBGL\SBBB\Sb_EquipMentCollectionTechParam.cs" />
<Compile Include="Models\Sc_StationOutBillSub_Sup.cs" />
<Compile Include="Models\Gy_MateNumRelation_Sec.cs" />
<Compile Include="Models\ClsQC_RequestCheckBillMain.cs" />
<Compile Include="Models\ClsQC_RequestCheckBillSub.cs" />
+ <Compile Include="Models\WorkStationSub.cs" />
<Compile Include="Models\Xs_SendGoodsPlanBillMain.cs" />
<Compile Include="Models\鍩虹璧勬枡\ClsGy_EmployeeSub.cs" />
<Compile Include="Models\鍩虹璧勬枡\Gy_ColorClass.cs" />
@@ -1022,7 +1040,7 @@
<Compile Include="Models\Sc_WorkDemandPlanBillSub.cs" />
<Compile Include="Models\SOPBill.cs" />
<Compile Include="Models\SOPBillSub.cs" />
- <Compile Include="Models\TechnologyParameter.cs" />
+ <Compile Include="Models\Gy_TechnologyParameter.cs" />
<Compile Include="Models\TechnologyParameterUnit.cs" />
<Compile Include="Models\TechParamByProc.cs" />
<Compile Include="Models\WorkCenter.cs" />
@@ -1223,6 +1241,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" />
@@ -1230,6 +1249,7 @@
<Compile Include="Utility\Barcode.ashx.cs">
<DependentUpon>Barcode.ashx</DependentUpon>
</Compile>
+ <Compile Include="Utility\JWTHelper.cs" />
<Compile Include="Utility\ServerTools.cs" />
<Compile Include="Utility\Util.cs" />
<Compile Include="Code\Common.cs" />
@@ -1295,6 +1315,7 @@
<Folder Include="App_Data\" />
<Folder Include="bin\" />
<Folder Include="Controllers\椤圭洰绠＄悊\鍩虹寤烘ā\" />
+ <Folder Include="DLL\SBGL\SBBB\" />
<Folder Include="obj\x86\Debug\" />
<Folder Include="Views\CB_WipProcessTable\" />
<Folder Include="Views\Cg_ContractTransportBillList\" />
@@ -1395,6 +1416,7 @@
<Folder Include="Views\Xt_CheckFlowBill\" />
<Folder Include="Views\Xt_CheckItem\" />
<Folder Include="Views\Xt_grdAlignment_WMES\" />
+ <Folder Include="Views\ZWDB\" />
</ItemGroup>
<ItemGroup>
<WCFMetadata Include="Service References\" />
--
Gitblit v1.9.1