From eb3803c0b654c00342f91fba559589e7ee9e5484 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期三, 12 三月 2025 14:42:44 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

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

diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index 624a041..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" />
@@ -718,6 +722,7 @@
     <Compile Include="Controllers\鐢熶骇绠＄悊\鎶ュ伐鍙板伐搴廫Sc_MESReturnStepWorkBillController.cs" />
     <Compile Include="Controllers\鐢熶骇绠＄悊\鎶ュ伐鍙板伐搴廫Sc_MESStopStepWorkBillController.cs" />
     <Compile Include="Controllers\鐢熶骇绠＄悊\鎶ュ伐鍙板伐搴廫Sc_QualityReportStepBillController.cs" />
+    <Compile Include="Controllers\鐢熶骇绠＄悊\鎺掍骇瑙ｉ攣鐢宠鍗昞JIT_UnLockRequestBillController.cs" />
     <Compile Include="Controllers\鐢熶骇绠＄悊\鎺掍骇閿佸畾鐢宠鍗昞JIT_LockRequestBillController.cs" />
     <Compile Include="Controllers\鐢熶骇绠＄悊\鐝寮�鐝崟\Sc_ShiftsBeginInfoBillController.cs" />
     <Compile Include="Controllers\鐢熶骇绠＄悊\鐢熶骇浠诲姟鍗昞Sc_ICMOBillController.cs" />
@@ -738,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" />
@@ -835,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" />
@@ -1164,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