From 9b54060aab13ef42f1d251dad16bef4d0c9264d9 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期五, 13 六月 2025 15:48:47 +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 b41c437..72ea2f3 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -603,6 +603,8 @@
<Compile Include="Controllers\鍝佽川绠＄悊\璐ㄩ噺鎶ヨ〃\QC_QualityReportsController.cs" />
<Compile Include="Controllers\CJGL\CJ_WIPBeginStockBillController.cs" />
<Compile Include="Controllers\鍝佽川绠＄悊\杞﹂棿鑷鍗昞QC_WorkSelfCheckBillController.cs" />
+ <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_BarCodeBill_PNL_TempController.cs" />
+ <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_BarCodeBill_Set_TempController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_CardChangeTypeController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_CardStatusController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_CardAddressController.cs" />
@@ -845,6 +847,8 @@
<Compile Include="HttpClient.cs" />
<Compile Include="InvokeHelper.cs" />
<Compile Include="Log.cs" />
+ <Compile Include="Models\ClsGy_BarCodeBill_PNL_Temp.cs" />
+ <Compile Include="Models\ClsGy_BarCodeBill_Set_Temp.cs" />
<Compile Include="Models\ClsGy_PatrolCheck.cs" />
<Compile Include="Models\ClsGy_Supplier_Link.cs" />
<Compile Include="Models\ClsGy_Supplier_PayPlan.cs" />
@@ -870,6 +874,7 @@
<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\Xs_SendGoodsPlanBillMain.cs" />
<Compile Include="Models\鍩虹璧勬枡\Gy_ColorClass.cs" />
<Compile Include="Models\Employee.cs" />
<Compile Include="Models\Gy_UserCustomer.cs" />
@@ -1182,6 +1187,7 @@
<Folder Include="Views\Cj_SendGoodsBill\" />
<Folder Include="Views\Cj_SingleStation\" />
<Folder Include="Views\Gy_BarCodeBill_Out\" />
+ <Folder Include="Views\Gy_BarCodeBill_Set_Temp\" />
<Folder Include="Views\Gy_COMMONCONTACTBill\" />
<Folder Include="Views\Gy_ConkType\" />
<Folder Include="Views\Gy_CustLocation\" />
--
Gitblit v1.9.1