From a0f8fee1feea1e1425f7061bbadda9a2f45f0ea1 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期五, 27 三月 2026 10:48:13 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
Model/Model.csproj | 33 +++++++++++++++++++++++++++++++--
1 files changed, 31 insertions(+), 2 deletions(-)
diff --git a/Model/Model.csproj b/Model/Model.csproj
index db7b1a7..d31530d 100644
--- a/Model/Model.csproj
+++ b/Model/Model.csproj
@@ -97,16 +97,27 @@
<Compile Include="APS\ClsSc_ICMOChangeBillMain.cs" />
<Compile Include="APS\ClsSc_ICMOChangeBillSub.cs" />
<Compile Include="ClsGy_PatrolCheckItemMethod_Model.cs" />
+ <Compile Include="ClsGy_SteppedPriceCoefficientBillMain.cs">
+ <Generator>ClsGy_SteppedPriceCoefficientBillMain</Generator>
+ </Compile>
<Compile Include="MES\ClsSc_MESStopRestoreWorkBillMain.cs" />
<Compile Include="MES\ClsSc_MESStopRestoreWorkBillSub.cs" />
<Compile Include="浠撳簱绠＄悊\ClsKf_TrolleyPositionBillMain.cs" />
<Compile Include="浠撳簱绠＄悊\ClsKf_TrolleyPositionBillSub.cs" />
<Compile Include="鍩虹璧勬枡\鍏朵粬鍩虹璧勬枡\ClsGy_PurPrice_Model.cs" />
<Compile Include="鍩虹璧勬枡\鍏朵粬鍩虹璧勬枡\ClsGy_MatePrice_Model.cs" />
+ <Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_CostAverageTypeSub_Model.cs" />
+ <Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_Gy_CostItemAverageType_Model_2.cs" />
+ <Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_CostItemFixRate_Model_2.cs" />
+ <Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_CostCenter_Model_2.cs" />
+ <Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_CostItem_Model_2.cs" />
+ <Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsCg_ContractTransportBillSub.cs" />
<Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_AssistantData.cs" />
<Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_AssistantDataEntry.cs" />
+ <Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_Car_Model_2.cs" />
<Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_Driver_Model.cs" />
<Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_DiscountList.cs" />
+ <Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsCg_ContractTransportBillMain.cs" />
<Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_OperatorGroup.cs" />
<Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsSc_PackUnionBillBarCode_temp_Model.cs" />
<Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_PatrolCheckItemClass_Model.cs" />
@@ -118,6 +129,14 @@
<Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_ProjectMoneyClass_Model.cs" />
<Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_RepairClass_Model.cs" />
<Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_RepairCheckClass_Model.cs" />
+ <Compile Include="鎴愭湰绠＄悊\ClsCB_ItemMoneyBillMain_1.cs" />
+ <Compile Include="鎴愭湰绠＄悊\ClsCB_ItemMoneyBillSub_1.cs" />
+ <Compile Include="鐗╂祦绠＄悊\ClsCg_CarTrajectoryBillMain.cs" />
+ <Compile Include="鐗╂祦绠＄悊\ClsCg_CarTrajectoryBillSub.cs" />
+ <Compile Include="鐗╂祦绠＄悊\ClsPay_WayBillPaymentBillMain.cs" />
+ <Compile Include="鐗╂祦绠＄悊\ClsPay_WayBillPaymentBillSub.cs" />
+ <Compile Include="鐗╂祦绠＄悊\ClsWL_YayBillMainBillSub.cs" />
+ <Compile Include="鐗╂祦绠＄悊\ClsWL_YayBillMainBillMain.cs" />
<Compile Include="鐢熶骇绠＄悊\ClsSc_ShiftsBeginInfoBillMain.cs" />
<Compile Include="鐢熶骇绠＄悊\ClsSc_ShiftsBeginInfoBillSub.cs" />
<Compile Include="ClsHR_EmpFosterBillMain.cs" />
@@ -174,6 +193,8 @@
<Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_EnvironmentTestItem_Model.cs" />
<Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_TechnologyParameterType_Model .cs" />
<Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_RestDay_Model.cs" />
+ <Compile Include="鐢熶骇绠＄悊\ClsSc_FeedingErrorProofingBillMain.cs" />
+ <Compile Include="鐢熶骇绠＄悊\ClsSc_FeedingErrorProofingBillSub.cs" />
<Compile Include="鐢熶骇绠＄悊\瀹㈡埛鏍囩\ClsSc_CustomerTagInfoMain.cs" />
<Compile Include="鐢熶骇绠＄悊\瀹㈡埛鏍囩\ClsSc_CustomerTagInfoSub.cs" />
<Compile Include="鐢熶骇绠＄悊\鎺掍骇瑙ｉ攣鐢宠鍗昞ClsJIT_UnLockRequestBillMain.cs" />
@@ -183,8 +204,8 @@
<Compile Include="鐢熶骇绠＄悊\妯″叿绠＄悊\ClsSc_MouldOutRequestBillSub.cs" />
<Compile Include="鐢熶骇绠＄悊\妯″叿绠＄悊\ClsSc_MouldOutRequestBillMain.cs" />
<Compile Include="鐢熶骇绠＄悊\妯″叿绠＄悊\ClsSc_MouldMaintainPlanBillSub_Plan.cs" />
- <Compile Include="鐢熶骇绠＄悊\妯″叿绠＄悊\ClsGy_QCVerificationBillMain.cs" />
- <Compile Include="鐢熶骇绠＄悊\妯″叿绠＄悊\ClsGy_QCVerificationBillSub.cs" />
+ <Compile Include="鐢熶骇绠＄悊\妯″叿绠＄悊\ClsGy_QCVerificationBillMain.cs" />
+ <Compile Include="鐢熶骇绠＄悊\妯″叿绠＄悊\ClsGy_QCVerificationBillSub.cs" />
<Compile Include="鐢熶骇绠＄悊\妯″叿绠＄悊\ClsSc_MouldInRequestBillMain.cs" />
<Compile Include="鐢熶骇绠＄悊\妯″叿绠＄悊\ClsSc_MouldMoveStockRequestBillMain.cs" />
<Compile Include="鐢熶骇绠＄悊\妯″叿绠＄悊\ClsSc_MouldInRequestBillSub.cs" />
@@ -207,6 +228,9 @@
<Compile Include="鐢熶骇绠＄悊\璁惧绠＄悊\ClsSb_EquipRepairSignBillSub.cs" />
<Compile Include="璐ㄦ绠＄悊\ClsQC_LastPieceCheckBillSub_ValueGrid.cs" />
<Compile Include="璐ㄦ绠＄悊\ClsQC_OutCompCheckBillSub_ValueGrid.cs" />
+ <Compile Include="璐ㄦ绠＄悊\ClsQC_LastPieceCheckBillSub_BadReason.cs" />
+ <Compile Include="璐ㄦ绠＄悊\ClsQC_OutCompCheckBillSub_BadReason.cs" />
+ <Compile Include="璐ㄦ绠＄悊\ClsQC_POStockInCheckBillSub_BadReason.cs" />
<Compile Include="璐ㄦ绠＄悊\ClsQC_POStockInCheckBillSub_ValueGrid.cs" />
<Compile Include="璐ㄦ绠＄悊\ClsQC_TakeSampleCheckBillMain.cs" />
<Compile Include="璐ㄦ绠＄悊\ClsQC_TakeSampleCheckBillSub.cs" />
@@ -758,6 +782,8 @@
<Compile Include="璐ㄦ绠＄悊\ClsGy_EnvironmentTestSchemeBillMain.cs" />
<Compile Include="杞﹂棿绠＄悊\ClsGy_MaterPreventErrMouldBillMain.cs" />
<Compile Include="璐ㄦ绠＄悊\ClsGy_EnvironmentTestSchemeBillSub.cs" />
+ <Compile Include="杞﹂棿绠＄悊\ClsSc_EmployeeSignInNoteBillSub.cs" />
+ <Compile Include="杞﹂棿绠＄悊\ClsSc_EmployeeSignInNoteBill.cs" />
<Compile Include="杞﹂棿绠＄悊\ClsQc_PreventErrMouldCheckBillMain.cs" />
<Compile Include="杞﹂棿绠＄悊\ClsGy_WorkBeginDotCheckListBillMain.cs" />
<Compile Include="杞﹂棿绠＄悊\ClsCJ_WIPBeginStockBillMain.cs" />
@@ -940,6 +966,9 @@
<Compile Include="閲囪喘绠＄悊\ClsCg_InvoiceSpecBillSub.cs">
<SubType>Code</SubType>
</Compile>
+ <Compile Include="閲囪喘绠＄悊\ClsCg_OrderTransportBillSub_Model.cs" />
+ <Compile Include="閲囪喘绠＄悊\ClsCg_OrderTransportBillSub_Money_Model.cs" />
+ <Compile Include="閲囪喘绠＄悊\ClsCg_OrderTransportBill_Model.cs" />
<Compile Include="閲囪喘绠＄悊\ClsCg_POInStockBackBillMain.cs">
<SubType>Code</SubType>
</Compile>
--
Gitblit v1.9.1