From c2c81f518deb22140121bbb1c76c672d69d533c8 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期二, 11 三月 2025 15:41:36 +0800
Subject: [PATCH] 生产资源，工序冲突合并

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

diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index c248595..2e90e83 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -441,6 +441,7 @@
     <Compile Include="Controllers\CJGL\Sc_KeyElementBindingController.cs" />
     <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\Xt_DefineBillMainSetController.cs" />
     <Compile Include="Controllers\MJGL\Sc_MouldBatchWorkCheckBillController.cs" />
     <Compile Include="Controllers\SBGL\SBBB\Sb_EquipMentCollectionTechParamController.cs" />
@@ -597,10 +598,12 @@
     <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_CardTypeController.cs" />
     <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_COMMONCONTACTBillController.cs" />
     <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_CustLocationController.cs" />
+    <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_MateNumRelationController.cs" />
     <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_DotCheckItemMethodController.cs" />
     <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_DotCheckItemClassController.cs" />
     <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_DutyBillController.cs" />
     <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_EquipStatusController.cs" />
+    <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_MatePriceCusController.cs" />
     <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_MatePriceSupController.cs" />
     <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_MaterTypeBillController.cs" />
     <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_MouldStatusController.cs" />
@@ -608,6 +611,7 @@
     <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_PaymentConditionListBillController.cs" />
     <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_DisposeWayController.cs" />
     <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_ProcMulController.cs" />
+    <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_RepairCheckClassController.cs" />
     <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_ScrapReasonController.cs" />
     <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_TemporaryAreaController.cs" />
     <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_RateTypeController.cs" />
@@ -739,6 +743,7 @@
     <Compile Include="DbUntil\DataFormatUntil.cs" />
     <Compile Include="DLL\ClsGy_BadPhenomena_Ctl.cs" />
     <Compile Include="DLL\ClsGy_EnvironmentTestItem_Ctl.cs" />
+    <Compile Include="DLL\ClsGy_RoutingGroup_Ctl.cs" />
     <Compile Include="DLL\ClsGy_ProcMul_Ctl.cs" />
     <Compile Include="DLL\ClsGy_TechnologyParameterType_Ctl.cs" />
     <Compile Include="DLL\ClsGy_InspectInstruMent_Ctl.cs" />
@@ -836,6 +841,7 @@
     <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\鍩虹璧勬枡\Gy_ColorClass.cs" />
     <Compile Include="Models\Employee.cs" />
     <Compile Include="Models\Gy_UserCustomer.cs" />
@@ -1165,6 +1171,7 @@
     <Folder Include="Views\Gy_PaymentConditionListBill\" />
     <Folder Include="Views\Gy_RateType\" />
     <Folder Include="Views\Gy_RecConditionBill\" />
+    <Folder Include="Views\Gy_RepairCheckClass\" />
     <Folder Include="Views\Gy_RoutingGroup\" />
     <Folder Include="Views\Gy_SettleStyle\" />
     <Folder Include="Views\Gy_SOPBill\" />

--
Gitblit v1.9.1