From a2a242077d814b48eb5ef2d609b5538f4fe30fad Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期一, 06 五月 2024 17:16:27 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
Model/Model.csproj | 30 ++++++++++++++++++++++++++++++
1 files changed, 30 insertions(+), 0 deletions(-)
diff --git a/Model/Model.csproj b/Model/Model.csproj
index 2c85214..f0533f1 100644
--- a/Model/Model.csproj
+++ b/Model/Model.csproj
@@ -239,6 +239,8 @@
<Compile Include="浠撳簱绠＄悊\ClsKf_MateOutRequestBillSub.cs" />
<Compile Include="浠撳簱绠＄悊\ClsKF_ChangeBoxBillMain.cs" />
<Compile Include="浠撳簱绠＄悊\ClsKF_ChangeBoxBillSub.cs" />
+ <Compile Include="浠撳簱绠＄悊\ClsSc_ProductionReturnBillSub.cs" />
+ <Compile Include="浠撳簱绠＄悊\ClsSc_ProductionReturnBillMain.cs" />
<Compile Include="浠撳簱绠＄悊\ClsKf_StepFoldInBillMain.cs" />
<Compile Include="浠撳簱绠＄悊\ClsKf_StepFoldInBillSub.cs" />
<Compile Include="浠撳簱绠＄悊\ClsKf_StepFoldOutBillSub.cs" />
@@ -286,7 +288,17 @@
<Compile Include="淇℃伅骞冲彴\ClsOA_ComFileBillMain.cs" />
<Compile Include="淇℃伅骞冲彴\ClsOA_ComFileBillSub.cs" />
<Compile Include="淇℃伅骞冲彴\ClsOA_EmpMinMessage.cs" />
+ <Compile Include="淇℃伅骞冲彴\ClsOA_ErrMsgBackCheckBillMain.cs" />
+ <Compile Include="淇℃伅骞冲彴\ClsOA_ErrMsgBackHandleBillMain.cs" />
+ <Compile Include="淇℃伅骞冲彴\ClsOA_ErrMsgBackCheckBillSub.cs" />
+ <Compile Include="淇℃伅骞冲彴\ClsOA_AndengFlowRuleBillMain.cs" />
+ <Compile Include="淇℃伅骞冲彴\ClsOA_ErrMsgBackSignBill.cs" />
+ <Compile Include="淇℃伅骞冲彴\ClsOA_ErrMsgBackReceiveBillMain.cs" />
<Compile Include="淇℃伅骞冲彴\ClsOA_ErrMsgBackBillMain.cs" />
+ <Compile Include="淇℃伅骞冲彴\ClsOA_ErrMsgBackHandleBillSub.cs" />
+ <Compile Include="淇℃伅骞冲彴\ClsOA_AndengFlowRuleBillSub.cs" />
+ <Compile Include="淇℃伅骞冲彴\ClsOA_ErrMsgBackSignBillSub.cs" />
+ <Compile Include="淇℃伅骞冲彴\ClsOA_ErrMsgBackReceiveBillSub.cs" />
<Compile Include="淇℃伅骞冲彴\ClsOA_ErrMsgBackBillSub.cs" />
<Compile Include="淇℃伅骞冲彴\ClsOA_ErrMsgBackBillSub2.cs" />
<Compile Include="淇℃伅骞冲彴\ClsOA_InformBillMain.cs" />
@@ -343,11 +355,15 @@
<Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_AreaUser_Model.cs">
<SubType>Code</SubType>
</Compile>
+ <Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_BadPhenomena_Model.cs" />
<Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_BadResult_Model.cs" />
<Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_CardChangeType_Model.cs" />
<Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_CardStatus_Model.cs" />
<Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_CardAddress_Model.cs" />
<Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_CardType_Model.cs" />
+ <Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_ErrMsgBackType_Model.cs" />
+ <Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_TaskClass_Model.cs" />
+ <Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_ProjectClass_Model.cs" />
<Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_StockCheckItem_Model.cs" />
<Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_InspectInstruMent_Model.cs" />
<Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_InspectBasis_Model.cs" />
@@ -453,6 +469,8 @@
<Compile Include="宸ヨ祫绠＄悊\ClsHR_EmpDimissionBillSub.cs" />
<Compile Include="宸ヨ祫绠＄悊\ClsHR_EmpEngageRequestBillMain.cs" />
<Compile Include="宸ヨ祫绠＄悊\ClsHR_EmpEngageRequestBillSub.cs" />
+ <Compile Include="宸ヨ祫绠＄悊\ClsHR_EmployeeSkillBillMain.cs" />
+ <Compile Include="宸ヨ祫绠＄悊\ClsHR_EmployeeSkillBillSub.cs" />
<Compile Include="宸ヨ祫绠＄悊\ClsPay_CarOutApplyBillMain.cs" />
<Compile Include="宸ヨ祫绠＄悊\ClsPay_CarOutApplyBillSub.cs" />
<Compile Include="宸ヨ祫绠＄悊\ClsPay_EmpInitChangeBillMain.cs" />
@@ -469,6 +487,8 @@
<Compile Include="宸ヨ祫绠＄悊\ClsPay_SubsidyChangeBillSub.cs" />
<Compile Include="宸ヨ祫绠＄悊\ClsPay_SumBalBillMain .cs" />
<Compile Include="宸ヨ祫绠＄悊\ClsPay_SumBalBillSub.cs" />
+ <Compile Include="宸ヨ祫绠＄悊\ClsHR_PostSkillBillMain.cs" />
+ <Compile Include="宸ヨ祫绠＄悊\ClsHR_PostSkillBillSub.cs" />
<Compile Include="搴旀敹绠＄悊\ClsYS_ReceiveOtherBillSub.cs" />
<Compile Include="鎴愭湰绠＄悊\ClsCB_ChangeMoneyBillMain.cs" />
<Compile Include="鎴愭湰绠＄悊\ClsCB_ChangeMoneyBillSub.cs" />
@@ -624,6 +644,14 @@
<Compile Include="绯荤粺鍏敤\ClsXt_SystemParameter_Model.cs" />
<Compile Include="璁″垝绠＄悊\ClsGy_MaterialTechParamBillSub.cs" />
<Compile Include="璁″垝绠＄悊\ClsGy_MaterialTechParamBillMain.cs" />
+ <Compile Include="璐ㄦ绠＄悊\ClsQC_NoPassProdConclusionBillMain.cs" />
+ <Compile Include="璐ㄦ绠＄悊\ClsQC_NoPassProdConclusionBillSub.cs" />
+ <Compile Include="璐ㄦ绠＄悊\ClsQC_NoPassProdDisposeCheckBillMain.cs" />
+ <Compile Include="璐ㄦ绠＄悊\ClsQC_NoPassProdDisposeBillMain.cs" />
+ <Compile Include="璐ㄦ绠＄悊\ClsQC_NoPassProdDisposeCheckBillSub.cs" />
+ <Compile Include="璐ㄦ绠＄悊\ClsQC_NoPassProdRequestBillMain.cs" />
+ <Compile Include="璐ㄦ绠＄悊\ClsQC_NoPassProdDisposeBillSub.cs" />
+ <Compile Include="璐ㄦ绠＄悊\ClsQC_NoPassProdRequestBillSub.cs" />
<Compile Include="璐ㄦ绠＄悊\ClsSc_ProcessExchangeBillMain_Note.cs" />
<Compile Include="璐ㄦ绠＄悊\ClsQC_FirstPieceCheckBillSub_ValueGrid.cs" />
<Compile Include="璐ㄦ绠＄悊\ClsQC_PatrolProcCheckBillSub_BadReason.cs" />
@@ -1006,6 +1034,8 @@
<Compile Include="椤圭洰绠＄悊\ClsPM_ProjectBeginBillMain.cs" />
<Compile Include="椤圭洰绠＄悊\ClsPM_ProjectEndBillSub.cs" />
<Compile Include="椤圭洰绠＄悊\ClsPM_ProjectBeginBillSub.cs" />
+ <Compile Include="椤圭洰绠＄悊\Cls锘縋M_WorkTaskMoneyBillMain.cs" />
+ <Compile Include="椤圭洰绠＄悊\ClsPM_WorkTaskMoneyBillSub.cs" />
<Compile Include="椤圭洰绠＄悊\ClsPM_ProjectMoneyBillSub.cs" />
<Compile Include="椤圭洰绠＄悊\ClsPM_ProjectMoneyBillMain.cs" />
<Compile Include="椤圭洰绠＄悊\ClsPM_CustomerTaskBillMain.cs" />
--
Gitblit v1.9.1