From 0ad8b5d768d28752aeb1aa2c9d548bcc12757f40 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期六, 28 二月 2026 09:41:46 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/WebAPI.csproj | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index e095697..7c0e43c 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -497,6 +497,7 @@
<Compile Include="Controllers\MJGL\Sc_MouldMoveStockRequestBillController.cs" />
<Compile Include="Controllers\MJGL\Gy_MaterialPackingRelationController.cs" />
<Compile Include="Controllers\QC_InStockCheckBillController.cs" />
+ <Compile Include="Controllers\SBGL\SBBB\Sb_EquipMentReportController.cs" />
<Compile Include="Controllers\SBGL\Sb_EquipPatrolCheckRuleBillController.cs" />
<Compile Include="Controllers\SBGL\Sb_EquipPatrolCheckPlanBillController.cs" />
<Compile Include="Controllers\SBGL\Sb_EquipPatrolCheckBillController.cs" />
@@ -512,8 +513,6 @@
<Compile Include="Controllers\XSGL\Xs_SeQuotationBillController.cs" />
<Compile Include="Controllers\Xt_DefineBillMainSetController.cs" />
<Compile Include="Controllers\MJGL\Sc_MouldBatchWorkCheckBillController.cs" />
- <Compile Include="Controllers\SBGL\SBBB\Sb_EquipMentCollectionTechParamController.cs" />
- <Compile Include="Controllers\SBGL\SBBB\Sb_EquipMentCollectionTechParam_TempController.cs" />
<Compile Include="Controllers\SCGL\Sc_ProductionReportsController.cs" />
<Compile Include="Controllers\XSGL\Xs_OutDoorBillController.cs" />
<Compile Include="Controllers\ZLGL\BaseSet\Gy_InspectBasisController.cs" />
@@ -707,6 +706,7 @@
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_CostItemAverageTypeController.cs" />
<Compile Include="Controllers\鎴愭湰绠＄悊\CB_ItemMoneyBillController.cs" />
<Compile Include="Controllers\鎴愭湰绠＄悊\CB_WipProcessTableController.cs" />
+ <Compile Include="Controllers\鎴愭湰绠＄悊\鎴愭湰璐圭敤璋冩暣鍗昞CB_ChangeMoneyBillController.cs" />
<Compile Include="Controllers\妫�楠岀敵璇峰崟\QC_RequestCheckBillController.cs" />
<Compile Include="Controllers\鐗╂祦绠＄悊\鍏朵粬缁撶畻鍗昞YF_PayMentOtherBillTranController.cs" />
<Compile Include="Controllers\鐗╂祦绠＄悊\鍑鸿繍鍗昞WLYayBillController.cs" />
@@ -936,7 +936,6 @@
<Compile Include="DLL\ClsSc_PHPCruxBillBill.cs" />
<Compile Include="DLL\ClsSc_ProcessPlan.cs" />
<Compile Include="DLL\ClsWW_PPBomBill.cs" />
- <Compile Include="DLL\SBGL\SBBB\Sb_EquipMentCollectionTechParam_Ctl.cs" />
<Compile Include="DLL\宸ヨ祫绠＄悊\ClsPay_GroupBalBill.cs" />
<Compile Include="DLL\宸ヨ祫绠＄悊\ClsGy_GroupEmpBill.cs" />
<Compile Include="DLL\宸ヨ祫绠＄悊\ClsPay_WorkTimesBill.cs" />
@@ -975,9 +974,8 @@
<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\Gy_TechnologyParameterSub.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\ClsQC_RequestCheckBillMain.cs" />
@@ -1021,7 +1019,7 @@
<Compile Include="Models\Sc_WorkDemandPlanBillSub.cs" />
<Compile Include="Models\SOPBill.cs" />
<Compile Include="Models\SOPBillSub.cs" />
- <Compile Include="Models\TechnologyParameter.cs" />
+ <Compile Include="Models\Gy_TechnologyParameter.cs" />
<Compile Include="Models\TechnologyParameterUnit.cs" />
<Compile Include="Models\TechParamByProc.cs" />
<Compile Include="Models\WorkCenter.cs" />
@@ -1294,6 +1292,7 @@
<Folder Include="App_Data\" />
<Folder Include="bin\" />
<Folder Include="Controllers\椤圭洰绠＄悊\鍩虹寤烘ā\" />
+ <Folder Include="DLL\SBGL\SBBB\" />
<Folder Include="obj\x86\Debug\" />
<Folder Include="Views\CB_WipProcessTable\" />
<Folder Include="Views\Cg_ContractTransportBillList\" />
--
Gitblit v1.9.1