From c27a4d97237e233678deb34b474fe8538b75dcb8 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期五, 20 六月 2025 15:43:41 +0800
Subject: [PATCH] 合并分支i

---
 WebAPI/WebAPI.csproj |   13 +++++++++----
 1 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index 648995d..635e6b1 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -449,8 +449,6 @@
     <Compile Include="Controllers\SBGL\Sb_EquipPatrolCheckRuleBillController.cs" />
     <Compile Include="Controllers\SBGL\Sb_EquipPatrolCheckPlanBillController.cs" />
     <Compile Include="Controllers\SBGL\Sb_EquipPatrolCheckBillController.cs" />
-    <Compile Include="Controllers\SCGL\Sc_RepairCodeBindingController.cs" />
-    <Compile Include="Controllers\SCGL\鏃ヨ鍒掔鐞哱JIT_DayPlanPlatFormBill_TKController.cs" />
     <Compile Include="Controllers\XSGL\Crm_ComplainVisitBillController.cs" />
     <Compile Include="Controllers\XSGL\Xs_SellOutBillList_SecController.cs" />
     <Compile Include="Controllers\XSGL\Xs_SeQuotationBillController.cs" />
@@ -466,6 +464,8 @@
     <Compile Include="Controllers\浜轰簨绠＄悊\浜哄憳灞ュ巻\HR_PersonnelResumeController.cs" />
     <Compile Include="Controllers\浠撳瓨绠＄悊\Kf_MoveStockBillController.cs" />
     <Compile Include="Controllers\浠撳瓨绠＄悊\鐢熶骇棰嗘枡\Kf_ProductReceiveMaterialBillController.cs" />
+    <Compile Include="Controllers\鍗庤繙datamapping\QC_CheckNote_PNL_TempController.cs" />
+    <Compile Include="Controllers\鍗庤繙datamapping\HY_DataMappingController.cs" />
     <Compile Include="Controllers\鍝佽川绠＄悊\鍩虹璧勬枡\Gy_BaseInformationController.cs" />
     <Compile Include="Controllers\鍝佽川绠＄悊\鐜妫�娴嬪崟\QC_EnvironmentTestDotCheckBillController.cs" />
     <Compile Include="Controllers\鍝佽川绠＄悊\璐ㄩ噺鏈堝害鐩爣鍗昞QC_MonthTarGetBillController.cs" />
@@ -605,8 +605,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\鍗庤繙datamapping\Gy_BarCodeBill_PNL_TempController.cs" />
+    <Compile Include="Controllers\鍗庤繙datamapping\Gy_BarCodeBill_Set_TempController.cs" />
     <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_CardChangeTypeController.cs" />
     <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_CardStatusController.cs" />
     <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_CardAddressController.cs" />
@@ -628,6 +628,8 @@
     <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_OperatorController.cs" />
     <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_PaymentConditionListBillController.cs" />
     <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_DisposeWayController.cs" />
+    <Compile Include="Controllers\鍗庤繙datamapping\Gy_PNLInfoController.cs" />
+    <Compile Include="Models\ClsGy_PNLInfoSub.cs" />
     <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_ProcMulController.cs" />
     <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_RepairCheckClassController.cs" />
     <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_ScrapReasonController.cs" />
@@ -852,6 +854,7 @@
     <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_PNLInfo.cs" />
     <Compile Include="Models\ClsGy_Supplier_Link.cs" />
     <Compile Include="Models\ClsGy_Supplier_PayPlan.cs" />
     <Compile Include="Models\ClsGy_MouldFileBillSub_DotCheckRule.cs" />
@@ -871,11 +874,13 @@
     <Compile Include="Models\ClsSc_MESBeginWorkBillSub_RelationBill.cs" />
     <Compile Include="Models\Gy_MouldFileSub_SubMater.cs" />
     <Compile Include="Models\Gy_RoutingBillSub_WorkQty.cs" />
+    <Compile Include="Models\ClsQC_CheckNote_PNL_Temp.cs" />
     <Compile Include="Models\QC_OutCompCheckBillSub_ValueGrid.cs" />
     <Compile Include="Models\SBGL\SBBB\Sb_EquipMentCollectionTechParam_Temp.cs" />
     <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" />

--
Gitblit v1.9.1