From 376da7978b200c4d9168a838f1eb57c5bbe0f551 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期日, 07 十二月 2025 11:39:35 +0800
Subject: [PATCH] 合并分支

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

diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index c67f0e3..fa076e7 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -277,12 +277,14 @@
     <Content Include="fonts\glyphicons-halflings-regular.svg" />
     <Content Include="Global.asax" />
     <Content Include="Index.html" />
+    <Content Include="Properties\PublishProfiles\JFAPI.pubxml.user" />
     <Content Include="Views\Scripts\bootstrap.js" />
     <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\PublishProfiles\JFAPI.pubxml" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
@@ -450,6 +452,8 @@
     <Compile Include="Controllers\CJGL\Sc_OEEReportController.cs" />
     <Compile Include="Controllers\CKGL\TMZD\Gy_BarCodeBillListController.cs" />
     <Compile Include="Controllers\JHGL\Gy_SourceMouldBillController.cs" />
+    <Compile Include="Controllers\MJGL\Sc_MouldProdMoveBillController.cs" />
+    <Compile Include="Controllers\MJGL\Sc_MouldProdBackBillController.cs" />
     <Compile Include="Controllers\MJGL\Sc_MouldProdOutBillController.cs" />
     <Compile Include="Controllers\MJGL\Sc_MouldOutRequestBillController.cs" />
     <Compile Include="Controllers\MJGL\Sc_MouldInRequestBillController.cs" />
@@ -625,6 +629,7 @@
     <Compile Include="Controllers\鍗庤繙datamapping\Gy_BarCodeBill_Set_TempController.cs" />
     <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_AssistantDataEntryController.cs" />
     <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_BilloriginController.cs" />
+    <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_CarController.cs" />
     <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_CardChangeTypeController.cs" />
     <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_CardStatusController.cs" />
     <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_CardAddressController.cs" />
@@ -654,6 +659,7 @@
     <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_MultipleCode_ReportController.cs" />
     <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_PlanImplementation_ReportController.cs" />
     <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_PNLInfoTypeLevelController.cs" />
+    <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_ShelfLifeNearExpiryController.cs" />
     <Compile Include="Controllers\椤圭洰绠＄悊\宸ョ▼椤圭洰\PM_ProjectBill_WorkController.cs" />
     <Compile Include="DLL\ClsSc_MESStopRestoreWorkBill.cs" />
     <Compile Include="DLL\ClsSc_PackUnionBillBarCode_temp_Ctl.cs" />

--
Gitblit v1.9.1