From d38136e8b743a3186dc873d0f18e5a58e84e86d9 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期四, 24 十一月 2022 08:51:40 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
Model/Model.csproj | 31 +++++++++++++++++++++++++++++++
1 files changed, 31 insertions(+), 0 deletions(-)
diff --git a/Model/Model.csproj b/Model/Model.csproj
index 63c5645..2af9d9f 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,15 +219,19 @@
<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" />
<Compile Include="浠撳簱绠＄悊\ClsKF_ChangeBoxBillMain.cs" />
<Compile Include="浠撳簱绠＄悊\ClsKF_ChangeBoxBillSub.cs" />
+ <Compile Include="浠撳簱绠＄悊\ClsKf_MoveStockStepOutBillMain.cs" />
<Compile Include="浠撳簱绠＄悊\ClsKf_MoveStockBillMain.cs" />
<Compile Include="浠撳簱绠＄悊\ClsKf_MoveStockBillScheme.cs" />
+ <Compile Include="浠撳簱绠＄悊\ClsKf_MoveStockStepOutBillSub.cs" />
<Compile Include="浠撳簱绠＄悊\ClsKf_MoveStockBillSub.cs" />
<Compile Include="浠撳簱绠＄悊\ClsKf_OtherInBillMain.cs" />
<Compile Include="浠撳簱绠＄悊\ClsKf_OtherInBillScheme.cs" />
@@ -276,10 +292,12 @@
<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" />
<Compile Include="鍩虹璧勬枡\鍏朵粬鍩虹璧勬枡\ClsGy_SourceShift_Model.cs" />
+ <Compile Include="鍩虹璧勬枡\鍏朵粬鍩虹璧勬枡\ClsGy_StdWorkTimes_Model.cs" />
<Compile Include="鍩虹璧勬枡\鍏朵粬鍩虹璧勬枡\ClsGy_TechParamByProc_Model.cs" />
<Compile Include="鍩虹璧勬枡\鍏朵粬鍩虹璧勬枡\ClsGy_UserCustomerRelation_Model.cs" />
<Compile Include="鍩虹璧勬枡\鍏朵粬鍩虹璧勬枡\ClsGy_UserDeptRelation_Model.cs" />
@@ -317,6 +335,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" />
@@ -499,7 +518,15 @@
<Compile Include="鐢熶骇绠＄悊\妯″叿绠＄悊\ClsSc_MouldMaintainRuleBillMain.cs" />
<Compile Include="鐢熶骇绠＄悊\妯″叿绠＄悊\ClsSc_MouldMaintainRuleBillSub.cs" />
<Compile Include="鐢熶骇绠＄悊\妯″叿绠＄悊\ClsSc_MouldMaintainRuleBillSub_Item.cs" />
+ <Compile Include="鐢熶骇绠＄悊\妯″叿绠＄悊\ClsSc_MouldMoveStockStepOutBillSub.cs" />
+ <Compile Include="鐢熶骇绠＄悊\妯″叿绠＄悊\ClsSc_MouldMoveStockStepOutBillMain.cs" />
+ <Compile Include="鐢熶骇绠＄悊\妯″叿绠＄悊\ClsSc_MouldScrapInBillMain.cs" />
+ <Compile Include="鐢熶骇绠＄悊\妯″叿绠＄悊\ClsSc_MouldScrapInBillSub.cs" />
+ <Compile Include="鐢熶骇绠＄悊\妯″叿绠＄悊\ClsSc_MouldRepairOutBillMain.cs" />
+ <Compile Include="鐢熶骇绠＄悊\妯″叿绠＄悊\ClsSc_MouldRepairInBillMain.cs" />
<Compile Include="鐢熶骇绠＄悊\妯″叿绠＄悊\ClsSc_MouldOtherInBillMain.cs" />
+ <Compile Include="鐢熶骇绠＄悊\妯″叿绠＄悊\ClsSc_MouldRepairOutBillSub.cs" />
+ <Compile Include="鐢熶骇绠＄悊\妯″叿绠＄悊\ClsSc_MouldRepairInBillSub.cs" />
<Compile Include="鐢熶骇绠＄悊\妯″叿绠＄悊\ClsSc_MouldOtherInBillSub.cs" />
<Compile Include="鐢熶骇绠＄悊\妯″叿绠＄悊\ClsSc_MouldOtherOutBillMain.cs" />
<Compile Include="鐢熶骇绠＄悊\妯″叿绠＄悊\ClsSc_MouldOtherOutBillSub.cs" />
@@ -635,7 +662,9 @@
<Compile Include="杞﹂棿绠＄悊\ClsSc_StationOutBillMain.cs" />
<Compile Include="杞﹂棿绠＄悊\ClsSc_StationOutBillSub.cs" />
<Compile Include="杞﹂棿绠＄悊\ClsSc_StationOutBillSub_Item.cs" />
+ <Compile Include="杞﹂棿绠＄悊\ClsSc_ABJJDMain.cs" />
<Compile Include="杞﹂棿绠＄悊\ClsWW_EntrustWorkOrderBillMain.cs" />
+ <Compile Include="杞﹂棿绠＄悊\ClsSc_ABJJDSub.cs" />
<Compile Include="杞﹂棿绠＄悊\ClsWW_EntrustWorkOrderBillSub.cs" />
<Compile Include="杞﹂棿绠＄悊\Sc_ProcessExchangeBackBillMain.cs" />
<Compile Include="杞﹂棿绠＄悊\Sc_ProcessExchangeBackBillSub.cs" />
@@ -704,6 +733,8 @@
<Compile Include="閲囪喘绠＄悊\ClsWW_EntrustOrderBillSub.cs">
<SubType>Code</SubType>
</Compile>
+ <Compile Include="閲囪喘绠＄悊\ClsWW_PPBomBillMain.cs" />
+ <Compile Include="閲囪喘绠＄悊\ClsWW_PPBomBillSub.cs" />
<Compile Include="閲囪喘绠＄悊\Sup_SendGoodsBillMain.cs" />
<Compile Include="閲囪喘绠＄悊\Sup_SendGoodsBillSub.cs" />
<Compile Include="閲戣澏CLOUD鍗曟嵁\浠撳簱绠＄悊\ClsKf_EntrustInBackBillMain_CLD.cs" />
--
Gitblit v1.9.1