From 97267e65bbdef1192a075401a18beea13f7676ea Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期一, 29 七月 2024 12:22:24 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
Model/Model.csproj | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 53 insertions(+), 0 deletions(-)
diff --git a/Model/Model.csproj b/Model/Model.csproj
index 0617fae..484865b 100644
--- a/Model/Model.csproj
+++ b/Model/Model.csproj
@@ -138,6 +138,14 @@
<Compile Include="CRM\ClsSec_ProductRepairBillMain.cs" />
<Compile Include="CRM\ClsSec_ProductRepairBillSub.cs" />
<Compile Include="CRM\ClsSec_ProductRepairBillSub1.cs" />
+ <Compile Include="WMS\ClsWMS_CusBarCodeCheckBillMain.cs" />
+ <Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_RestDay_Model.cs" />
+ <Compile Include="璐ㄦ绠＄悊\ClsQC_MonthTarGetBillMain.cs" />
+ <Compile Include="璐ㄦ绠＄悊\ClsQC_MonthTarGetBillSub.cs" />
+ <Compile Include="鐢熶骇绠＄悊\璁惧绠＄悊\ClsSb_EquipRepairSignBillMain.cs" />
+ <Compile Include="鐢熶骇绠＄悊\璁惧绠＄悊\ClsSb_EquipRepairSignBillSub.cs" />
+ <Compile Include="璐ㄦ绠＄悊\ClsQC_TakeSampleCheckBillMain.cs" />
+ <Compile Include="璐ㄦ绠＄悊\ClsQC_TakeSampleCheckBillSub.cs" />
<Compile Include="MES\ClsSc_SourceLineRepairBillSub_Mater.cs" />
<Compile Include="MES\ClsSc_SourceLineRepairBillSub.cs" />
<Compile Include="MES\ClsSc_SourceLineRepairBillMain.cs" />
@@ -291,10 +299,12 @@
<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" />
@@ -359,7 +369,14 @@
<Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_CardStatus_Model.cs" />
<Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_CardAddress_Model.cs" />
<Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_CardType_Model.cs" />
+ <Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_DotCheckItemMethod_Model.cs" />
+ <Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_DotCheckItemClass_Model.cs" />
<Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_ErrMsgBackType_Model.cs" />
+ <Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_CheckNoteItem_Model.cs" />
+ <Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_MaintainLev_Model.cs" />
+ <Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_PreventErrMould_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" />
@@ -456,6 +473,7 @@
<Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_BarCodeCheckType_Model.cs" />
<Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_Item30JiTai_Model.cs" />
<Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_User_Model.cs" />
+ <Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_UnitConvertRate_Model.cs" />
<Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_Work_Model.cs" />
<Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsXt_FastICSchemeMain_Model.cs" />
<Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsXt_FastICSchemeSub_Model.cs" />
@@ -467,6 +485,8 @@
<Compile Include="宸ヨ祫绠＄悊\ClsHR_EmpEngageRequestBillSub.cs" />
<Compile Include="宸ヨ祫绠＄悊\ClsHR_EmployeeSkillBillMain.cs" />
<Compile Include="宸ヨ祫绠＄悊\ClsHR_EmployeeSkillBillSub.cs" />
+ <Compile Include="宸ヨ祫绠＄悊\ClsHR_EmployeeSkillExamBillMain.cs" />
+ <Compile Include="宸ヨ祫绠＄悊\ClsHR_EmployeeSkillExamBillSub.cs" />
<Compile Include="宸ヨ祫绠＄悊\ClsPay_CarOutApplyBillMain.cs" />
<Compile Include="宸ヨ祫绠＄悊\ClsPay_CarOutApplyBillSub.cs" />
<Compile Include="宸ヨ祫绠＄悊\ClsPay_EmpInitChangeBillMain.cs" />
@@ -637,9 +657,26 @@
<Compile Include="鐢熶骇绠＄悊\璁惧绠＄悊\ClsSb_EquipConkBookBillSub.cs" />
<Compile Include="鐢熶骇绠＄悊\璁惧绠＄悊\ClsGy_FixCardBillMain.cs" />
<Compile Include="鐢熶骇绠＄悊\璁惧绠＄悊\ClsGy_FixCardBillSub_Emp.cs" />
+ <Compile Include="鐢熶骇绠＄悊\璁惧绠＄悊\ClsSb_EquipBeginBillMain.cs" />
+ <Compile Include="鐢熶骇绠＄悊\璁惧绠＄悊\ClsSB_EquipICMOTechParamBillMain.cs" />
+ <Compile Include="鐢熶骇绠＄悊\璁惧绠＄悊\ClsSB_EquipICMOTechParamBillSub.cs" />
+ <Compile Include="鐢熶骇绠＄悊\璁惧绠＄悊\ClsSb_EquipStopBillMain.cs" />
+ <Compile Include="鐢熶骇绠＄悊\璁惧绠＄悊\ClsSb_EquipBeginBillSub.cs" />
+ <Compile Include="鐢熶骇绠＄悊\璁惧绠＄悊\ClsSb_EquipStopBillSub.cs" />
<Compile Include="绯荤粺鍏敤\ClsXt_SystemParameter_Model.cs" />
<Compile Include="璁″垝绠＄悊\ClsGy_MaterialTechParamBillSub.cs" />
<Compile Include="璁″垝绠＄悊\ClsGy_MaterialTechParamBillMain.cs" />
+ <Compile Include="璐ㄦ绠＄悊\ClsQC_BackSampleCheckBillMain.cs" />
+ <Compile Include="璐ㄦ绠＄悊\ClsQC_BackSampleCheckBillSub.cs" />
+ <Compile Include="璐ㄦ绠＄悊\ClsQC_PatrolProcCheckOtherBillMain.cs" />
+ <Compile Include="璐ㄦ绠＄悊\ClsQC_PatrolProcCheckOtherBillSub.cs" />
+ <Compile Include="璐ㄦ绠＄悊\ClsQC_PatrolProcCheckOtherBillSub_ValueGrid.cs" />
+ <Compile Include="璐ㄦ绠＄悊\ClsQC_WorkSelfCheckBillMain.cs" />
+ <Compile Include="璐ㄦ绠＄悊\ClsQC_StockCheckBillMain.cs" />
+ <Compile Include="璐ㄦ绠＄悊\ClsQC_WorkSelfCheckBillSub.cs" />
+ <Compile Include="璐ㄦ绠＄悊\ClsQC_StockCheckBillSub.cs" />
+ <Compile Include="璐ㄦ绠＄悊\ClsQC_WorkSelfCheckBillSub_ValueGrid.cs" />
+ <Compile Include="璐ㄦ绠＄悊\ClsQC_StockCheckBillSub_ValueGrid.cs" />
<Compile Include="璐ㄦ绠＄悊\ClsQC_NoPassProdConclusionBillMain.cs" />
<Compile Include="璐ㄦ绠＄悊\ClsQC_NoPassProdConclusionBillSub.cs" />
<Compile Include="璐ㄦ绠＄悊\ClsQC_NoPassProdDisposeCheckBillMain.cs" />
@@ -654,6 +691,16 @@
<Compile Include="璐ㄦ绠＄悊\ClsQC_ProcessCheckBillSub_ValueGrid.cs" />
<Compile Include="璐ㄦ绠＄悊\ClsCrm_CustomerAppealBillSub.cs" />
<Compile Include="璐ㄦ绠＄悊\ClsCrm_CustomerAppealBillMain.cs" />
+ <Compile Include="杞﹂棿绠＄悊\ClsGy_MaterPreventErrMouldBillMain.cs" />
+ <Compile Include="杞﹂棿绠＄悊\ClsQc_PreventErrMouldCheckBillMain.cs" />
+ <Compile Include="杞﹂棿绠＄悊\ClsGy_WorkBeginDotCheckListBillMain.cs" />
+ <Compile Include="杞﹂棿绠＄悊\ClsCJ_WIPBeginStockBillMain.cs" />
+ <Compile Include="杞﹂棿绠＄悊\ClsCJ_WIPBeginStockBillSub.cs" />
+ <Compile Include="杞﹂棿绠＄悊\ClsSc_WorkBeginDotCheckBillMain.cs" />
+ <Compile Include="杞﹂棿绠＄悊\ClsGy_MaterPreventErrMouldBillSub.cs" />
+ <Compile Include="杞﹂棿绠＄悊\ClsQc_PreventErrMouldCheckBillSub.cs" />
+ <Compile Include="杞﹂棿绠＄悊\ClsGy_WorkBeginDotCheckListBillSub.cs" />
+ <Compile Include="杞﹂棿绠＄悊\ClsSc_WorkBeginDotCheckBillSub.cs" />
<Compile Include="杞﹂棿绠＄悊\Sc_AssemblyBill_BindSourceTemp.cs" />
<Compile Include="杞﹂棿绠＄悊\ClsSc_ProcExchRecordBackBillMain.cs" />
<Compile Include="杞﹂棿绠＄悊\ClsSc_ProcExchRecordBackBillSub.cs" />
@@ -1026,10 +1073,16 @@
<Compile Include="閿�鍞鐞哱鍗曡瘉绠＄悊\ClsXs_LadingBillSub.cs" />
<Compile Include="閿�鍞鐞哱鍗曡瘉绠＄悊\ClsXs_ShippingAdviceBillMain.cs" />
<Compile Include="閿�鍞鐞哱鍗曡瘉绠＄悊\ClsXs_ShippingAdviceBillSub.cs" />
+ <Compile Include="椤圭洰绠＄悊\ClsGy_ProjectMoneyBOMBillMain.cs" />
+ <Compile Include="椤圭洰绠＄悊\ClsGy_ProjectMoneyBOMBillSub.cs" />
<Compile Include="椤圭洰绠＄悊\ClsPM_ProjectEndBillMain.cs" />
<Compile Include="椤圭洰绠＄悊\ClsPM_ProjectBeginBillMain.cs" />
<Compile Include="椤圭洰绠＄悊\ClsPM_ProjectEndBillSub.cs" />
<Compile Include="椤圭洰绠＄悊\ClsPM_ProjectBeginBillSub.cs" />
+ <Compile Include="椤圭洰绠＄悊\ClsGy_WorkTaskMoneyBOMBillMain.cs" />
+ <Compile Include="椤圭洰绠＄悊\ClsGy_WorkTaskMoneyBOMBillSub.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