From 2d07ecf4a434a9d68d3ba82997916c5eade88d35 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期三, 06 五月 2026 17:12:02 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

---
 WebAPI/WebAPI.csproj |   15 +++++++++++++++
 1 files changed, 15 insertions(+), 0 deletions(-)

diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index d8df164..24309d2 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,8 @@
     <Content Include="Web.config">
       <SubType>Designer</SubType>
     </Content>
+    <Content Include="ZPLTemplate\鐗╂枡鏉＄爜 80脳60.zpl" />
+    <Content Include="ZPLTemplate\鐗╂枡鏉＄爜 100脳60.zpl" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="App_Start\BundleConfig.cs" />
@@ -426,6 +432,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 +519,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 +692,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" />
@@ -1002,6 +1011,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,6 +1254,8 @@
     <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">
@@ -1319,6 +1331,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\" />
@@ -1352,6 +1365,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\" />
@@ -1380,6 +1394,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