From e5c4d6eb5a9e17ddec04647dce7e810bb4485ae4 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期二, 12 五月 2026 15:04:40 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/WebAPI.csproj | 20 ++++++++++++++++++++
1 files changed, 20 insertions(+), 0 deletions(-)
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index 8ebef0a..9ce858b 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -47,6 +47,9 @@
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
+ <Reference Include="Alex.Kingdee.Cloud.WebAPI.Client, Version=2.5.0.0, Culture=neutral, processorArchitecture=MSIL">
+ <HintPath>..\packages\Alex.Kingdee.Cloud.WebAPI.Client.2.5.0\lib\net45\Alex.Kingdee.Cloud.WebAPI.Client.dll</HintPath>
+ </Reference>
<Reference Include="AlibabaCloud.EndpointUtil, Version=0.1.1.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\AlibabaCloud.EndpointUtil.0.1.1\lib\net45\AlibabaCloud.EndpointUtil.dll</HintPath>
</Reference>
@@ -331,6 +334,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>
@@ -414,6 +418,9 @@
<Content Include="Web.config">
<SubType>Designer</SubType>
</Content>
+ <Content Include="ZPLTemplate\鐗╂枡鏉＄爜 80脳60.zpl" />
+ <Content Include="ZPLTemplate\鐗╂枡鏉＄爜 100脳60.zpl" />
+ <Content Include="ZPLTemplate\娴嬭瘯.zpl" />
</ItemGroup>
<ItemGroup>
<Compile Include="App_Start\BundleConfig.cs" />
@@ -426,6 +433,7 @@
<Compile Include="Controllers\BaseSet\Gy_ColorClassController.cs" />
<Compile Include="Controllers\BaseSet\Gy_DriverController.cs" />
<Compile Include="Controllers\BaseSet\Gy_ICBomBillController.cs" />
+ <Compile Include="Controllers\BaseSet\Gy_SampleSchemeController.cs" />
<Compile Include="Controllers\BaseSet\Gy_WorkDayController.cs" />
<Compile Include="Controllers\BaseSet\Gy_PackTypeController.cs" />
<Compile Include="Controllers\BaseSet\Gy_RoutingGroupController.cs" />
@@ -512,6 +520,7 @@
<Compile Include="Controllers\MJGL\Sc_MouldInRequestBillController.cs" />
<Compile Include="Controllers\MJGL\Sc_MouldMoveStockRequestBillController.cs" />
<Compile Include="Controllers\MJGL\Gy_MaterialPackingRelationController.cs" />
+ <Compile Include="Controllers\PM_ProjectCommunicationBillListController.cs" />
<Compile Include="Controllers\QC_InStockCheckBillController.cs" />
<Compile Include="Controllers\SBGL\SBBB\Sb_EquipMentReportController.cs" />
<Compile Include="Controllers\SBGL\Sb_EquipPatrolCheckRuleBillController.cs" />
@@ -684,6 +693,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" />
@@ -726,10 +736,12 @@
<Compile Include="Controllers\鎴愭湰绠＄悊\CB_ActualItemMoneyCostController.cs" />
<Compile Include="Controllers\鎴愭湰绠＄悊\CB_WipProcessTableController.cs" />
<Compile Include="Controllers\鎴愭湰绠＄悊\鎴愭湰璐圭敤璋冩暣鍗昞CB_ChangeMoneyBillController.cs" />
+ <Compile Include="Controllers\鏁版嵁鍚屾\閲戣澏鍩虹璧勬枡鍚屾\KDBaseInfoSyncController.cs" />
<Compile Include="Controllers\妫�楠岀敵璇峰崟\QC_RequestCheckBillController.cs" />
<Compile Include="Controllers\鐗╂祦绠＄悊\鍏朵粬缁撶畻鍗昞YF_PayMentOtherBillTranController.cs" />
<Compile Include="Controllers\鐗╂祦绠＄悊\鍑鸿繍鍗昞WLYayBillController.cs" />
<Compile Include="Controllers\鐗╂祦绠＄悊\杩愬崟璐圭敤缁撶畻鍗昞Pay_WayBillPaymentBillController.cs" />
+ <Compile Include="Controllers\閫氱敤鏂规硶\鏂囦欢涓婁紶\WebFileController.cs" />
<Compile Include="Controllers\椤圭洰绠＄悊\宸ョ▼椤圭洰\PM_ProjectBill_WorkController.cs" />
<Compile Include="DLL\ClsGy_ItemMoney_Ctl.cs" />
<Compile Include="DLL\ClsSc_MESStopRestoreWorkBill.cs" />
@@ -1002,6 +1014,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" />
@@ -1244,13 +1257,17 @@
<Compile Include="Service\JwtAuthorizeAttribute.cs" />
<Compile Include="Service\LuBaoSevice.cs" />
<Compile Include="Service\ProcessDal.cs" />
+ <Compile Include="Service\RequireSignatureAttribute.cs" />
+ <Compile Include="Service\SignatureVerifyAttribute.cs" />
<Compile Include="Service\YqnDal.cs" />
<Compile Include="Service\YqnQbService.cs" />
<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" />
@@ -1317,6 +1334,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\" />
@@ -1350,6 +1368,7 @@
<Folder Include="Views\Gy_RecConditionBill\" />
<Folder Include="Views\Gy_RepairCheckClass\" />
<Folder Include="Views\Gy_RoutingGroup\" />
+ <Folder Include="Views\Gy_SampleScheme\" />
<Folder Include="Views\Gy_SettleStyle\" />
<Folder Include="Views\Gy_SOPBill\" />
<Folder Include="Views\Gy_SourceWorkStationSet\" />
@@ -1378,6 +1397,7 @@
<Folder Include="Views\Mes_OrderProcFlowAllReport\" />
<Folder Include="Views\MoveStockBill\" />
<Folder Include="Views\Pay_Report\" />
+ <Folder Include="Views\PM_ProjectCommunicationBillList\" />
<Folder Include="Views\ProductionPlanReport\" />
<Folder Include="Views\ProductionReturnBill\" />
<Folder Include="Views\QC_Management\" />
--
Gitblit v1.9.1