From 3f745fba68b1ec4e2bac4eff026f9db35fa9518c Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期五, 29 八月 2025 09:11:51 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/WebAPI.csproj | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index a275b16..675580d 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -281,6 +281,7 @@
<Content Include="Views\Scripts\bootstrap.min.js" />
<Content Include="Config\kdapi.config" />
<Content Include="libman.json" />
+ <Content Include="Template\barCodeTemplateStorage.json" />
<None Include="Properties\PublishProfiles\FolderProfilewtt.pubxml" />
<None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
@@ -635,7 +636,9 @@
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_PaymentConditionListBillController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_DisposeWayController.cs" />
<Compile Include="Controllers\鍗庤繙datamapping\Gy_PNLInfoController.cs" />
+ <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_PNLInfoTypeLevelController.cs" />
<Compile Include="Controllers\椤圭洰绠＄悊\宸ョ▼椤圭洰\PM_ProjectBill_WorkController.cs" />
+ <Compile Include="Models\GroupOrderBill.cs" />
<Compile Include="Models\ClsGy_PNLInfoSub.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_ProcMulController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_RepairCheckClassController.cs" />
@@ -862,6 +865,7 @@
<Compile Include="Models\ClsGy_BarCodeBill_Set_Temp.cs" />
<Compile Include="Models\ClsGy_PatrolCheck.cs" />
<Compile Include="Models\ClsGy_PNLInfo.cs" />
+ <Compile Include="Models\ClsGy_PNLTypeLevel.cs" />
<Compile Include="Models\ClsGy_Supplier_Link.cs" />
<Compile Include="Models\ClsGy_Supplier_PayPlan.cs" />
<Compile Include="Models\ClsGy_MouldFileBillSub_DotCheckRule.cs" />
@@ -1219,6 +1223,7 @@
<Folder Include="Views\Gy_Operator\" />
<Folder Include="Views\Gy_PackType\" />
<Folder Include="Views\Gy_PaymentConditionListBill\" />
+ <Folder Include="Views\Gy_PNLInfoTypeLevel\" />
<Folder Include="Views\Gy_RateType\" />
<Folder Include="Views\Gy_RecConditionBill\" />
<Folder Include="Views\Gy_RepairCheckClass\" />
--
Gitblit v1.9.1