From abf59bc386d65013b4782eb0b3af463457dbe968 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期二, 12 三月 2024 09:23:29 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
Model/Model.csproj | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 59 insertions(+), 1 deletions(-)
diff --git a/Model/Model.csproj b/Model/Model.csproj
index f8fd1c1..7d5f886 100644
--- a/Model/Model.csproj
+++ b/Model/Model.csproj
@@ -90,6 +90,8 @@
<Compile Include="APS\ClsSourceICMOValues.cs" />
<Compile Include="APS\ClsSc_WorkBillMonthSortBillMain.cs" />
<Compile Include="APS\ClsSc_WorkBillMonthSortBillSub.cs" />
+ <Compile Include="APS\ClsSc_ICMOChangeBillMain.cs" />
+ <Compile Include="APS\ClsSc_ICMOChangeBillSub.cs" />
<Compile Include="ClsHR_EmpFosterBillMain.cs" />
<Compile Include="ClsHR_EmpFosterBillSub.cs" />
<Compile Include="ClsHR_EmpUpChangeBillMain.cs" />
@@ -102,6 +104,7 @@
<Compile Include="ClsPay_RewardPunishBillSub.cs" />
<Compile Include="ClsPay_WorkErrTimesBillMain.cs" />
<Compile Include="ClsPay_WorkErrTimesBillSub.cs" />
+ <Compile Include="ClsGy_MaterialMouldBillSub.cs" />
<Compile Include="ClsXt_PrintBill_Model.cs" />
<Compile Include="CRM\ClsCrm_ClueBillMain.cs" />
<Compile Include="CRM\ClsCrm_ClueBillSub.cs" />
@@ -223,6 +226,9 @@
<Compile Include="浠撳簱绠＄悊\ClsKf_EntrustOutBillMain.cs" />
<Compile Include="浠撳簱绠＄悊\ClsKf_EntrustOutBillSub.cs" />
<Compile Include="浠撳簱绠＄悊\ClsKf_EntrustReplenishOutBillMain.cs" />
+ <Compile Include="浠撳簱绠＄悊\ClsKf_MoveStockStepInBillMain.cs" />
+ <Compile Include="浠撳簱绠＄悊\ClsKf_MoveStockStepInBillScheme.cs" />
+ <Compile Include="浠撳簱绠＄悊\ClsKf_MoveStockStepOutBillScheme.cs" />
<Compile Include="浠撳簱绠＄悊\ClsKf_MateReplenishOutBillMain.cs" />
<Compile Include="浠撳簱绠＄悊\ClsKf_MateOutBillMain.cs" />
<Compile Include="浠撳簱绠＄悊\ClsKf_MateOutBillScheme.cs" />
@@ -233,9 +239,14 @@
<Compile Include="浠撳簱绠＄悊\ClsKf_MateOutRequestBillSub.cs" />
<Compile Include="浠撳簱绠＄悊\ClsKF_ChangeBoxBillMain.cs" />
<Compile Include="浠撳簱绠＄悊\ClsKF_ChangeBoxBillSub.cs" />
+ <Compile Include="浠撳簱绠＄悊\ClsKf_StepFoldInBillMain.cs" />
+ <Compile Include="浠撳簱绠＄悊\ClsKf_StepFoldInBillSub.cs" />
+ <Compile Include="浠撳簱绠＄悊\ClsKf_StepFoldOutBillSub.cs" />
+ <Compile Include="浠撳簱绠＄悊\ClsKf_StepFoldOutBillMain.cs" />
<Compile Include="浠撳簱绠＄悊\ClsKf_MoveStockStepOutBillMain.cs" />
<Compile Include="浠撳簱绠＄悊\ClsKf_MoveStockBillMain.cs" />
<Compile Include="浠撳簱绠＄悊\ClsKf_MoveStockBillScheme.cs" />
+ <Compile Include="浠撳簱绠＄悊\ClsKf_MoveStockStepInBillSub.cs" />
<Compile Include="浠撳簱绠＄悊\ClsKf_MoveStockStepOutBillSub.cs" />
<Compile Include="浠撳簱绠＄悊\ClsKf_MoveStockBillSub.cs" />
<Compile Include="浠撳簱绠＄悊\ClsKf_OtherInBillMain.cs" />
@@ -328,6 +339,18 @@
<Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_AreaUser_Model.cs">
<SubType>Code</SubType>
</Compile>
+ <Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_BadResult_Model.cs" />
+ <Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_CardAddress_Model.cs" />
+ <Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_CardType_Model.cs" />
+ <Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_StockCheckItem_Model.cs" />
+ <Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_InspectInstruMent_Model.cs" />
+ <Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_InspectBasis_Model.cs" />
+ <Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_PostSkill_Model.cs" />
+ <Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_StockMoveStyle_Model.cs" />
+ <Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_QualityStd_Model.cs" />
+ <Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_InspectMethod_Model.cs" />
+ <Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_InspectValue_Model .cs" />
+ <Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_BadType_Model.cs" />
<Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_BigArea_Model.cs" />
<Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_BusinessUnit_Model.cs" />
<Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_Carbook_Model.cs" />
@@ -339,6 +362,7 @@
<Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_Operator_Model.cs" />
<Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_RateType_Model.cs" />
<Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_Staff_Model.cs" />
+ <Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_ProjectMoney_Model.cs" />
<Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_TaxMIXMain_Model.cs" />
<Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_TaxMIXSub_Model.cs" />
<Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_TaxRate_Model.cs" />
@@ -415,6 +439,8 @@
<Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_Item30JiTai_Model.cs" />
<Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_User_Model.cs" />
<Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_Work_Model.cs" />
+ <Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsXt_FastICSchemeMain_Model.cs" />
+ <Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsXt_FastICSchemeSub_Model.cs" />
<Compile Include="宸ヤ綅鐪嬫澘\ClsGy_SOPBillMain.cs" />
<Compile Include="宸ヤ綅鐪嬫澘\ClsGy_SOPBillSub.cs" />
<Compile Include="宸ヨ祫绠＄悊\ClsHR_EmpDimissionBillMain.cs" />
@@ -437,6 +463,7 @@
<Compile Include="宸ヨ祫绠＄悊\ClsPay_SubsidyChangeBillSub.cs" />
<Compile Include="宸ヨ祫绠＄悊\ClsPay_SumBalBillMain .cs" />
<Compile Include="宸ヨ祫绠＄悊\ClsPay_SumBalBillSub.cs" />
+ <Compile Include="搴旀敹绠＄悊\ClsYS_ReceiveOtherBillSub.cs" />
<Compile Include="鎴愭湰绠＄悊\ClsCB_ChangeMoneyBillMain.cs" />
<Compile Include="鎴愭湰绠＄悊\ClsCB_ChangeMoneyBillSub.cs" />
<Compile Include="鎴愭湰绠＄悊\ClsCB_EntrustMoneyCost_M.cs" />
@@ -582,14 +609,19 @@
<Compile Include="鐢熶骇绠＄悊\妯″叿绠＄悊\ClsSc_MouldStatusChangeBillSub.cs" />
<Compile Include="鐢熶骇绠＄悊\妯″叿绠＄悊\ClsSc_MouldStockBillMain.cs" />
<Compile Include="鐢熶骇绠＄悊\妯″叿绠＄悊\ClsSc_MouldStockBillSub.cs" />
+ <Compile Include="鐢熶骇绠＄悊\璁惧绠＄悊\ClsGy_EquipTypeBill.cs" />
<Compile Include="鐢熶骇绠＄悊\璁惧绠＄悊\ClsSb_EquipConkBookBillMain.cs" />
<Compile Include="鐢熶骇绠＄悊\璁惧绠＄悊\ClsSb_EquipConkBookBillSub.cs" />
+ <Compile Include="绯荤粺鍏敤\ClsXt_SystemParameter_Model.cs" />
+ <Compile Include="璁″垝绠＄悊\ClsGy_MaterialTechParamBillSub.cs" />
+ <Compile Include="璁″垝绠＄悊\ClsGy_MaterialTechParamBillMain.cs" />
<Compile Include="璐ㄦ绠＄悊\ClsSc_ProcessExchangeBillMain_Note.cs" />
<Compile Include="璐ㄦ绠＄悊\ClsQC_FirstPieceCheckBillSub_ValueGrid.cs" />
<Compile Include="璐ㄦ绠＄悊\ClsQC_PatrolProcCheckBillSub_BadReason.cs" />
<Compile Include="璐ㄦ绠＄悊\ClsQC_ProcessCheckBillSub_ValueGrid.cs" />
<Compile Include="璐ㄦ绠＄悊\ClsCrm_CustomerAppealBillSub.cs" />
<Compile Include="璐ㄦ绠＄悊\ClsCrm_CustomerAppealBillMain.cs" />
+ <Compile Include="杞﹂棿绠＄悊\Sc_AssemblyBill_BindSourceTemp.cs" />
<Compile Include="杞﹂棿绠＄悊\ClsSc_ProcExchRecordBackBillMain.cs" />
<Compile Include="杞﹂棿绠＄悊\ClsSc_ProcExchRecordBackBillSub.cs" />
<Compile Include="杞﹂棿绠＄悊\ClsSc_ProcExchSendWorkBillMain.cs" />
@@ -803,6 +835,8 @@
</Compile>
<Compile Include="閲囪喘绠＄悊\ClsWW_PPBomBillMain.cs" />
<Compile Include="閲囪喘绠＄悊\ClsWW_PPBomBillSub.cs" />
+ <Compile Include="閲囪喘绠＄悊\ClsCg_PayableBillMain.cs" />
+ <Compile Include="閲囪喘绠＄悊\ClsCg_PayableSub.cs" />
<Compile Include="閲囪喘绠＄悊\Sup_SendGoodsBillMain.cs" />
<Compile Include="閲囪喘绠＄悊\Sup_SendGoodsBillSub.cs" />
<Compile Include="閲戣澏CLOUD鍗曟嵁\浠撳簱绠＄悊\ClsKf_EntrustInBackBillMain_CLD.cs" />
@@ -911,6 +945,16 @@
<Compile Include="閲戣澏鍗曟嵁\閿�鍞鐞哱ClsXs_SeOutStockBackBillSub_K3.cs" />
<Compile Include="閲戣澏鍗曟嵁\閿�鍞鐞哱ClsXs_SeOutStockBillMain_K3.cs" />
<Compile Include="閲戣澏鍗曟嵁\閿�鍞鐞哱ClsXs_SeOutStockBillSub_K3.cs" />
+ <Compile Include="閿�鍞鐞哱ClsXs_SellOutChangeBillSub.cs" />
+ <Compile Include="閿�鍞鐞哱ClsXs_SellOutChangeBillMain.cs" />
+ <Compile Include="閿�鍞鐞哱ClsKf_ICStockBackBillMain.cs" />
+ <Compile Include="閿�鍞鐞哱ClsKf_ICStockBackBillSub.cs" />
+ <Compile Include="閿�鍞鐞哱ClsXs_ReceivableBillSub.cs" />
+ <Compile Include="閿�鍞鐞哱ClsXs_ReceivableBillMain.cs" />
+ <Compile Include="閿�鍞鐞哱ClsXs_SeOrderChangeBillSub.cs" />
+ <Compile Include="閿�鍞鐞哱ClsXs_SeOrderChangeBillMain.cs" />
+ <Compile Include="閿�鍞鐞哱ClsXs_ExceptiveCheckRequestBillSub.cs" />
+ <Compile Include="閿�鍞鐞哱ClsXs_ExceptiveCheckRequestBillMain.cs" />
<Compile Include="閿�鍞鐞哱ClsXs_ContractBillMain.cs" />
<Compile Include="閿�鍞鐞哱ClsXs_ContractBillScheme.cs" />
<Compile Include="閿�鍞鐞哱ClsXs_ContractBillSub.cs" />
@@ -948,6 +992,21 @@
<Compile Include="閿�鍞鐞哱鍗曡瘉绠＄悊\ClsXs_LadingBillSub.cs" />
<Compile Include="閿�鍞鐞哱鍗曡瘉绠＄悊\ClsXs_ShippingAdviceBillMain.cs" />
<Compile Include="閿�鍞鐞哱鍗曡瘉绠＄悊\ClsXs_ShippingAdviceBillSub.cs" />
+ <Compile Include="椤圭洰绠＄悊\ClsPM_ProjectEndBillMain.cs" />
+ <Compile Include="椤圭洰绠＄悊\ClsPM_ProjectBeginBillMain.cs" />
+ <Compile Include="椤圭洰绠＄悊\ClsPM_ProjectEndBillSub.cs" />
+ <Compile Include="椤圭洰绠＄悊\ClsPM_ProjectBeginBillSub.cs" />
+ <Compile Include="椤圭洰绠＄悊\ClsPM_ProjectMoneyBillSub.cs" />
+ <Compile Include="椤圭洰绠＄悊\ClsPM_ProjectMoneyBillMain.cs" />
+ <Compile Include="椤圭洰绠＄悊\ClsPM_CustomerTaskBillMain.cs" />
+ <Compile Include="椤圭洰绠＄悊\ClsGy_MaterialMouldBillMain.cs" />
+ <Compile Include="椤圭洰绠＄悊\ClsPM_WorkPlanMonthBillMain.cs" />
+ <Compile Include="椤圭洰绠＄悊\ClsPM_CustomerTaskBillSub.cs" />
+ <Compile Include="椤圭洰绠＄悊\ClsPM_WorkReportWeekBillSub.cs" />
+ <Compile Include="椤圭洰绠＄悊\ClsPM_WorkReportWeekBillMain.cs" />
+ <Compile Include="椤圭洰绠＄悊\ClsPM_WorkPlanMonthBillSub.cs" />
+ <Compile Include="椤圭洰绠＄悊\ClsPM_WorkTaskWeekBillSub.cs" />
+ <Compile Include="椤圭洰绠＄悊\ClsPM_WorkTaskWeekBillMain.cs" />
<Compile Include="椤圭洰绠＄悊\ClsPro_DesignBlueRequestBillMain.cs" />
<Compile Include="椤圭洰绠＄悊\ClsPro_DesignBlueRequestBillSub.cs" />
<Compile Include="椤圭洰绠＄悊\ClsPro_ProjectCheckBillMain.cs" />
@@ -1169,7 +1228,6 @@
<Compile Include="搴旀敹绠＄悊\ClsYS_ReceiveBillMain.cs" />
<Compile Include="搴旀敹绠＄悊\ClsYS_ReceiveBillSub.cs" />
<Compile Include="搴旀敹绠＄悊\ClsYS_ReceiveOtherBillMain.cs" />
- <Compile Include="搴旀敹绠＄悊\ClsYS_ReceiveOtherBillSub.cs" />
<Compile Include="搴旀敹绠＄悊\ClsYS_ReceiveShouldBillMain.cs" />
<Compile Include="搴旀敹绠＄悊\ClsYS_ReceiveShouldBillSub.cs" />
<Compile Include="璁″垝绠＄悊\ClsGy_ICBomBillMain.cs" />
--
Gitblit v1.9.1