From 3dd22468e8d5dae8628f9beafa678f5529d4c22a Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期一, 19 十二月 2022 10:55:53 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
Model/Model.csproj | 34 ++++++++++++++++++++++++++++++++++
1 files changed, 34 insertions(+), 0 deletions(-)
diff --git a/Model/Model.csproj b/Model/Model.csproj
index 9d264c3..ac80a05 100644
--- a/Model/Model.csproj
+++ b/Model/Model.csproj
@@ -90,6 +90,18 @@
<Compile Include="APS\ClsSourceICMOValues.cs" />
<Compile Include="APS\ClsSc_WorkBillMonthSortBillMain.cs" />
<Compile Include="APS\ClsSc_WorkBillMonthSortBillSub.cs" />
+ <Compile Include="ClsHR_EmpFosterBillMain.cs" />
+ <Compile Include="ClsHR_EmpFosterBillSub.cs" />
+ <Compile Include="ClsHR_EmpUpChangeBillMain.cs" />
+ <Compile Include="ClsHR_EmpUpChangeBillSub.cs" />
+ <Compile Include="ClsPay_AbsentBillMain.cs" />
+ <Compile Include="ClsPay_AbsentBillSub.cs" />
+ <Compile Include="ClsPay_EarlyLateErrBillMain.cs" />
+ <Compile Include="ClsPay_EarlyLateErrBillSub.cs" />
+ <Compile Include="ClsPay_RewardPunishBillMain.cs" />
+ <Compile Include="ClsPay_RewardPunishBillSub.cs" />
+ <Compile Include="ClsPay_WorkErrTimesBillMain.cs" />
+ <Compile Include="ClsPay_WorkErrTimesBillSub.cs" />
<Compile Include="ClsXt_PrintBill_Model.cs" />
<Compile Include="CRM\ClsCrm_ClueBillMain.cs" />
<Compile Include="CRM\ClsCrm_ClueBillSub.cs" />
@@ -207,8 +219,10 @@
<Compile Include="浠撳簱绠＄悊\ClsKf_EntrustInBillSub.cs" />
<Compile Include="浠撳簱绠＄悊\ClsKf_EntrustOutBillMain.cs" />
<Compile Include="浠撳簱绠＄悊\ClsKf_EntrustOutBillSub.cs" />
+ <Compile Include="浠撳簱绠＄悊\ClsKf_MateReplenishOutBillMain.cs" />
<Compile Include="浠撳簱绠＄悊\ClsKf_MateOutBillMain.cs" />
<Compile Include="浠撳簱绠＄悊\ClsKf_MateOutBillScheme.cs" />
+ <Compile Include="浠撳簱绠＄悊\ClsKf_MateReplenishOutBillSub.cs" />
<Compile Include="浠撳簱绠＄悊\ClsKf_MateOutBillSub.cs" />
<Compile Include="浠撳簱绠＄悊\ClsKf_MateOutRequestBillMain.cs" />
<Compile Include="浠撳簱绠＄悊\ClsKf_MateOutRequestBillSub.cs" />
@@ -278,6 +292,7 @@
<Compile Include="鍩虹璧勬枡\鍏朵粬鍩虹璧勬枡\ClsGy_CostCenterDeptRelation_Model.cs" />
<Compile Include="鍩虹璧勬枡\鍏朵粬鍩虹璧勬枡\ClsGy_CostItemAccount_Model.cs" />
<Compile Include="鍩虹璧勬枡\鍏朵粬鍩虹璧勬枡\ClsGy_MateMouldInfo_Model.cs" />
+ <Compile Include="鍩虹璧勬枡\鍏朵粬鍩虹璧勬枡\ClsGy_MateMould_Model.cs" />
<Compile Include="鍩虹璧勬枡\鍏朵粬鍩虹璧勬枡\ClsGy_MatePriceProperty_Model.cs" />
<Compile Include="鍩虹璧勬枡\鍏朵粬鍩虹璧勬枡\ClsGy_QCCheckProjectMain.cs" />
<Compile Include="鍩虹璧勬枡\鍏朵粬鍩虹璧勬枡\ClsGy_QCCheckProjectSub.cs" />
@@ -309,6 +324,14 @@
<Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_Carbook_Model.cs" />
<Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_CareFor_Model.cs" />
<Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_CheckToolsType_Model.cs" />
+ <Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_CustLocation_Model.cs" />
+ <Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_Operator_Model.cs" />
+ <Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_RateType_Model.cs" />
+ <Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_Staff_Model.cs" />
+ <Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_TaxMIXMain_Model.cs" />
+ <Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_TaxMIXSub_Model.cs" />
+ <Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_TaxRate_Model.cs" />
+ <Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_PaymentCondition_Model.cs" />
<Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_Company_Model.cs" />
<Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_ConveyComp_Model.cs" />
<Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_ConveyType_Model.cs" />
@@ -320,6 +343,7 @@
<Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_CusLevel_Model.cs" />
<Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_CusStatus_Model.cs" />
<Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_Dealer_Model.cs" />
+ <Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_FactoryDayOff_Model.cs" />
<Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_DisposeWay_Model.cs" />
<Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_DotCheck_Model.cs" />
<Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_Dweller_Model.cs" />
@@ -336,6 +360,10 @@
<Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_Logo_Model.cs" />
<Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_MainMaterial_Model.cs" />
<Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_Market_Model.cs" />
+ <Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_COMMONCONTACT_Model.cs" />
+ <Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_RecCondition_Model.cs" />
+ <Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_SupplierContact_Model.cs" />
+ <Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_StockStatus_Model.cs" />
<Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_MaterType_Model.cs" />
<Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_MouldFileMain.cs" />
<Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_MouldFileSub.cs" />
@@ -375,6 +403,7 @@
<Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_BarCodeCheckType_Model.cs" />
<Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_Item30JiTai_Model.cs" />
<Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_User_Model.cs" />
+ <Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_Work_Model.cs" />
<Compile Include="宸ヤ綅鐪嬫澘\ClsGy_SOPBillMain.cs" />
<Compile Include="宸ヤ綅鐪嬫澘\ClsGy_SOPBillSub.cs" />
<Compile Include="宸ヨ祫绠＄悊\ClsHR_EmpDimissionBillMain.cs" />
@@ -416,6 +445,8 @@
<Compile Include="鐢熶骇绠＄悊\ClsSc_ChangeNoteBillSub.cs" />
<Compile Include="鐢熶骇绠＄悊\ClsSc_MateWasterRequestBillMain.cs" />
<Compile Include="鐢熶骇绠＄悊\ClsSc_MateWasterRequestBillSub.cs" />
+ <Compile Include="鐢熶骇绠＄悊\ClsSc_PPBomBillMain.cs" />
+ <Compile Include="鐢熶骇绠＄悊\ClsSc_PPBomBillSub.cs" />
<Compile Include="鐢熶骇绠＄悊\ClsSc_WIPStockChangeBillMain.cs" />
<Compile Include="鐢熶骇绠＄悊\ClsSc_WIPStockChangeBillSub.cs" />
<Compile Include="鐢熶骇绠＄悊\ClsSc_WIPStockCheckBillMain.cs" />
@@ -498,6 +529,7 @@
<Compile Include="鐢熶骇绠＄悊\妯″叿绠＄悊\ClsSc_MouldMaintainBillMain.cs" />
<Compile Include="鐢熶骇绠＄悊\妯″叿绠＄悊\ClsSc_MouldMaintainBillSub.cs" />
<Compile Include="鐢熶骇绠＄悊\妯″叿绠＄悊\ClsSc_MouldMaintainPlanBillMain.cs" />
+ <Compile Include="鐢熶骇绠＄悊\妯″叿绠＄悊\ClsSc_MouldMaintainPlanBillSub_Item.cs" />
<Compile Include="鐢熶骇绠＄悊\妯″叿绠＄悊\ClsSc_MouldMaintainPlanBillSub.cs" />
<Compile Include="鐢熶骇绠＄悊\妯″叿绠＄悊\ClsSc_MouldMaintainRuleBillMain.cs" />
<Compile Include="鐢熶骇绠＄悊\妯″叿绠＄悊\ClsSc_MouldMaintainRuleBillSub.cs" />
@@ -550,6 +582,7 @@
<Compile Include="鐢熶骇绠＄悊\璁惧绠＄悊\ClsSb_EquipRepairRequestBillSub.cs" />
<Compile Include="鐢熶骇绠＄悊\璁惧绠＄悊\ClsSb_EquipRepairSendWorkBillMain.cs" />
<Compile Include="鐢熶骇绠＄悊\璁惧绠＄悊\ClsSb_EquipRepairSendWorkBillSub.cs" />
+ <Compile Include="鐢熶骇绠＄悊\璁惧绠＄悊\ClsSb_EquipRepairWorkBillSub_Mater.cs" />
<Compile Include="鐢熶骇绠＄悊\璁惧绠＄悊\ClsSc_EquipMaintainBillSub_Item.cs" />
<Compile Include="鐢熶骇绠＄悊\璁惧绠＄悊\ClsSc_EquipMaintainPlanBillSub_Item.cs" />
<Compile Include="鐢熶骇绠＄悊\璁惧绠＄悊\ClsSc_ICMOBillMain.cs" />
@@ -557,6 +590,7 @@
<Compile Include="绯荤粺鍏敤\ClsOA_EmpMessageBillModSub.cs" />
<Compile Include="绯荤粺鍏敤\ClsOA_FieldToChangeMain.cs" />
<Compile Include="绯荤粺鍏敤\ClsOA_FieldToChangeSub.cs" />
+ <Compile Include="绯荤粺鍏敤\ClsXt_BillType_Model.cs" />
<Compile Include="绯荤粺鍏敤\ClsXt_ModuleParameterMain.cs" />
<Compile Include="绯荤粺鍏敤\ClsXt_ModuleParameterSub.cs" />
<Compile Include="琛屾斂绠＄悊\ClsOF_DormCheckBookBillMain.cs" />
--
Gitblit v1.9.1