From 549df1cac1529f4fc9b5d9b64e27de5d5d8b8951 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期三, 22 十月 2025 13:53:41 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

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

diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index 675580d..06be01c 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -443,6 +443,7 @@
     <Compile Include="Controllers\CJGL\Cj_SendGoodsBillController.cs" />
     <Compile Include="Controllers\CJGL\Mes_OrderProcFlowAllReportController.cs" />
     <Compile Include="Controllers\CJGL\Gy_MaterPreventErrMouldBillController.cs" />
+    <Compile Include="Controllers\CJGL\ReportController.cs" />
     <Compile Include="Controllers\CJGL\Sc_KeyElementBindingController.cs" />
     <Compile Include="Controllers\CJGL\Sc_OEEReportController.cs" />
     <Compile Include="Controllers\CKGL\TMZD\Gy_BarCodeBillListController.cs" />
@@ -450,6 +451,7 @@
     <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_MESStopRestoreWorkBillController.cs" />
     <Compile Include="Controllers\SCGL\Sc_RepairCodeBindingController.cs" />
     <Compile Include="Controllers\SCGL\鏃ヨ鍒掔鐞哱JIT_DayPlanPlatFormBill_TKController.cs" />
     <Compile Include="Controllers\SCGL\鏃ヨ鍒掔鐞哱Xs_SendGoodsPlanBillController.cs" />
@@ -613,13 +615,17 @@
     <Compile Include="Controllers\鍝佽川绠＄悊\杞﹂棿鑷鍗昞QC_WorkSelfCheckBillController.cs" />
     <Compile Include="Controllers\鍗庤繙datamapping\Gy_BarCodeBill_PNL_TempController.cs" />
     <Compile Include="Controllers\鍗庤繙datamapping\Gy_BarCodeBill_Set_TempController.cs" />
+    <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_AssistantDataEntryController.cs" />
+    <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_BilloriginController.cs" />
     <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_CardChangeTypeController.cs" />
     <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_CardStatusController.cs" />
     <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_CardAddressController.cs" />
     <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_CardTypeController.cs" />
     <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_COMMONCONTACTBillController.cs" />
     <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_CustLocationController.cs" />
+    <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_DiscountListController.cs" />
     <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_MatePriceController.cs" />
+    <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_OperatorGroupController.cs" />
     <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_PatrolCheckBillController.cs" />
     <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_PatrolCheckItemMethodController.cs" />
     <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_PatrolCheckItemClassController.cs" />
@@ -638,6 +644,15 @@
     <Compile Include="Controllers\鍗庤繙datamapping\Gy_PNLInfoController.cs" />
     <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_PNLInfoTypeLevelController.cs" />
     <Compile Include="Controllers\椤圭洰绠＄悊\宸ョ▼椤圭洰\PM_ProjectBill_WorkController.cs" />
+    <Compile Include="DLL\ClsSc_MESStopRestoreWorkBill.cs" />
+    <Compile Include="DLL\ClsSc_PackUnionBillBarCode_temp_Ctl.cs" />
+    <Compile Include="Models\ClsGy_Billorigin.cs" />
+    <Compile Include="Models\ClsSc_MESStopRestoreWorkBillMain.cs" />
+    <Compile Include="Models\ClsSc_MESStopRestoreWorkBillSub.cs" />
+    <Compile Include="Models\ClsWW_PPBomBillSubERP.cs" />
+    <Compile Include="Models\ClsWW_EntrustOrderBillMainSub.cs" />
+    <Compile Include="Models\ClsWW_PPBomBill.cs" />
+    <Compile Include="Models\ClsWW_EntrustOrderBillMain_1.cs" />
     <Compile Include="Models\GroupOrderBill.cs" />
     <Compile Include="Models\ClsGy_PNLInfoSub.cs" />
     <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_ProcMulController.cs" />
@@ -1209,6 +1224,7 @@
     <Folder Include="Views\Cj_SingleStation\" />
     <Folder Include="Views\Gy_BarCodeBill_Out\" />
     <Folder Include="Views\Gy_BarCodeBill_Set_Temp\" />
+    <Folder Include="Views\Gy_Billorigin\" />
     <Folder Include="Views\Gy_COMMONCONTACTBill\" />
     <Folder Include="Views\Gy_ConkType\" />
     <Folder Include="Views\Gy_CustLocation\" />
@@ -1271,6 +1287,7 @@
     <Folder Include="Views\Sc_ComplementGoodBill_ZXBZ\" />
     <Folder Include="Views\Sc_ComplementGoods\" />
     <Folder Include="Views\Sc_JIT_ComplementGoodBill\" />
+    <Folder Include="Views\Sc_MESStopRestoreWorkBill\" />
     <Folder Include="Views\Sc_MouldDotCheckRuleBill\" />
     <Folder Include="Views\Sc_MouldLifeUseBill\" />
     <Folder Include="Views\Sc_MouldRepairOutBill\" />

--
Gitblit v1.9.1