From edcd7574e709748c5d3ccc0bd54930414ddcfc9a Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期五, 30 五月 2025 21:00:08 +0800
Subject: [PATCH] 合并冲突

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

diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index 026ea12..b41c437 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -446,8 +446,9 @@
     <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\SCGL\Sc_RepairCodeBindingController.cs" />
-    <Compile Include="Controllers\SCGL\鏃ヨ鍒掔鐞哱JIT_DayPlanPlatFormBill_TKController.cs" />
+    <Compile Include="Controllers\SBGL\Sb_EquipPatrolCheckRuleBillController.cs" />
+    <Compile Include="Controllers\SBGL\Sb_EquipPatrolCheckPlanBillController.cs" />
+    <Compile Include="Controllers\SBGL\Sb_EquipPatrolCheckBillController.cs" />
     <Compile Include="Controllers\XSGL\Crm_ComplainVisitBillController.cs" />
     <Compile Include="Controllers\XSGL\Xs_SellOutBillList_SecController.cs" />
     <Compile Include="Controllers\XSGL\Xs_SeQuotationBillController.cs" />
@@ -608,6 +609,9 @@
     <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_CardTypeController.cs" />
     <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_COMMONCONTACTBillController.cs" />
     <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_CustLocationController.cs" />
+    <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_PatrolCheckBillController.cs" />
+    <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_PatrolCheckItemMethodController.cs" />
+    <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_PatrolCheckItemClassController.cs" />
     <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_MateNumRelationController.cs" />
     <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_DotCheckItemMethodController.cs" />
     <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_DotCheckItemClassController.cs" />
@@ -722,9 +726,11 @@
     <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_RepairCheckBillController.cs" />
     <Compile Include="Controllers\鍩虹璧勬枡\宸ヨ祫鍩虹璧勬枡\Gy_ProcPriceController.cs" />
     <Compile Include="Controllers\搴旀敹绠＄悊\YS_ReceiveReportController.cs" />
+    <Compile Include="Controllers\鏁版嵁鍚屾\灏忚钁涘悓姝XZG_DataSynchronizationController.cs" />
     <Compile Include="Controllers\鏁版嵁鍚屾\閽夐拤鍚屾\DD_DataSynchronizationController.cs" />
     <Compile Include="Controllers\鏉＄爜绠＄悊\MouldController.cs" />
     <Compile Include="Controllers\鏉＄爜绠＄悊\WEBSController.cs" />
+    <Compile Include="Controllers\鐢熶骇绠＄悊\瀹㈡埛鏍囩\Sc_CustomerTagController.cs" />
     <Compile Include="Controllers\鐢熶骇绠＄悊\鎶ュ伐鍙板伐搴廫Sc_MaterToSourceStepBillController.cs" />
     <Compile Include="Controllers\鐢熶骇绠＄悊\鎶ュ伐鍙板伐搴廫Sc_MESBeginStepWorkBillController.cs" />
     <Compile Include="Controllers\鐢熶骇绠＄悊\鎶ュ伐鍙板伐搴廫Sc_MESEndStepWorkBillController.cs" />
@@ -801,6 +807,8 @@
     <Compile Include="DLL\ClsQC_NoPassProdCheckBill.cs" />
     <Compile Include="DLL\ClsQC_PatrolProcCheckBill.cs" />
     <Compile Include="DLL\ClsSb_EquipConkBookBill.cs" />
+    <Compile Include="DLL\ClsSb_EquipPatrolCheckRuleBill.cs" />
+    <Compile Include="DLL\ClsSb_EquipPatrolCheckBill.cs" />
     <Compile Include="DLL\ClsSb_EquipDotCheckBill.cs" />
     <Compile Include="DLL\ClsSb_EquipMaintainBill.cs" />
     <Compile Include="DLL\ClsSb_EquipMaintainRuleBill.cs" />
@@ -837,6 +845,7 @@
     <Compile Include="HttpClient.cs" />
     <Compile Include="InvokeHelper.cs" />
     <Compile Include="Log.cs" />
+    <Compile Include="Models\ClsGy_PatrolCheck.cs" />
     <Compile Include="Models\ClsGy_Supplier_Link.cs" />
     <Compile Include="Models\ClsGy_Supplier_PayPlan.cs" />
     <Compile Include="Models\ClsGy_MouldFileBillSub_DotCheckRule.cs" />
@@ -845,6 +854,10 @@
     <Compile Include="Models\ClsGy_SupMaterial.cs" />
     <Compile Include="Models\ClsGy_EquipFileBillSub_DotCheckRule.cs" />
     <Compile Include="Models\ClsGy_EquipFileBillSub_MaintainRule.cs" />
+    <Compile Include="Models\ClsSb_EquipPatrolCheckBillMain.cs" />
+    <Compile Include="Models\ClsSb_EquipPatrolCheckBillSub.cs" />
+    <Compile Include="Models\ClsSb_EquipPatrolCheckRuleBillMain.cs" />
+    <Compile Include="Models\ClsSb_EquipPatrolCheckRuleBillSub.cs" />
     <Compile Include="Models\ClsSb_EquipRepairSignBillMain.cs" />
     <Compile Include="Models\ClsSb_EquipRepairSignBillSub.cs" />
     <Compile Include="Models\ClsSc_AssemblyBillMain.cs" />

--
Gitblit v1.9.1