From 0a56001e1b8e9ae7d2f39c982912cd6d10c22032 Mon Sep 17 00:00:00 2001
From: cwjbxqmz <1134865194@qq.com>
Date: 星期二, 06 二月 2024 11:35:20 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
Model/Model.csproj | 66 +++++++++++++++++++++++++++++++++
1 files changed, 66 insertions(+), 0 deletions(-)
diff --git a/Model/Model.csproj b/Model/Model.csproj
index e8b8f03..063e65d 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" />
@@ -135,6 +137,9 @@
<Compile Include="CRM\ClsSec_ProductRepairBillMain.cs" />
<Compile Include="CRM\ClsSec_ProductRepairBillSub.cs" />
<Compile Include="CRM\ClsSec_ProductRepairBillSub1.cs" />
+ <Compile Include="MES\ClsSc_SourceLineRepairBillSub_Mater.cs" />
+ <Compile Include="MES\ClsSc_SourceLineRepairBillSub.cs" />
+ <Compile Include="MES\ClsSc_SourceLineRepairBillMain.cs" />
<Compile Include="MES\ClsSc_MESBeginWorkBillMain.cs" />
<Compile Include="MES\ClsSc_MESBeginWorkBillSub.cs" />
<Compile Include="MES\ClsSc_MESEndWorkBillMain.cs" />
@@ -303,6 +308,7 @@
<Compile Include="鍩虹璧勬枡\鍏朵粬鍩虹璧勬枡\ClsGy_QCCheckProjectSub.cs" />
<Compile Include="鍩虹璧勬枡\鍏朵粬鍩虹璧勬枡\ClsGy_SourceShift_Model.cs" />
<Compile Include="鍩虹璧勬枡\鍏朵粬鍩虹璧勬枡\ClsGy_StdWorkTimes_Model.cs" />
+ <Compile Include="鍩虹璧勬枡\鍏朵粬鍩虹璧勬枡\ClsGy_SupMaterial_Model.cs" />
<Compile Include="鍩虹璧勬枡\鍏朵粬鍩虹璧勬枡\ClsGy_TechParamByProc_Model.cs" />
<Compile Include="鍩虹璧勬枡\鍏朵粬鍩虹璧勬枡\ClsGy_UserCustomerRelation_Model.cs" />
<Compile Include="鍩虹璧勬枡\鍏朵粬鍩虹璧勬枡\ClsGy_UserDeptRelation_Model.cs" />
@@ -324,12 +330,24 @@
<Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_AreaUser_Model.cs">
<SubType>Code</SubType>
</Compile>
+ <Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_BadResult_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" />
<Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_CareFor_Model.cs" />
<Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_CheckToolsType_Model.cs" />
<Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_CustLocation_Model.cs" />
+ <Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_EquipStatus_Model.cs" />
+ <Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_MouldStatus_Model.cs" />
<Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_Operator_Model.cs" />
<Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_RateType_Model.cs" />
<Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_Staff_Model.cs" />
@@ -409,6 +427,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" />
@@ -446,6 +466,7 @@
<Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_TechnologyParameter_Model.cs" />
<Compile Include="鎴愭湰绠＄悊\ClsKf_ICBal.cs" />
<Compile Include="鎴愭湰绠＄悊\ClsKf_WIPBal.cs" />
+ <Compile Include="鐢熶骇绠＄悊\ClsGy_SourceWorkStationSet.cs" />
<Compile Include="鐢熶骇绠＄悊\ClsSc_ChangeNoteBillMain.cs" />
<Compile Include="鐢熶骇绠＄悊\ClsSc_ChangeNoteBillSub.cs" />
<Compile Include="鐢熶骇绠＄悊\ClsSc_MateWasterRequestBillMain.cs" />
@@ -534,6 +555,8 @@
<Compile Include="鐢熶骇绠＄悊\妯″叿绠＄悊\ClsSc_MouldEntrustOutPlanBillSub.cs" />
<Compile Include="鐢熶骇绠＄悊\妯″叿绠＄悊\ClsSc_MouldLifeChangeBillMain.cs" />
<Compile Include="鐢熶骇绠＄悊\妯″叿绠＄悊\ClsSc_MouldLifeChangeBillSub.cs" />
+ <Compile Include="鐢熶骇绠＄悊\妯″叿绠＄悊\ClsSc_MouldLifeUseBillMain.cs" />
+ <Compile Include="鐢熶骇绠＄悊\妯″叿绠＄悊\ClsSc_MouldLifeUseBillSub.cs" />
<Compile Include="鐢熶骇绠＄悊\妯″叿绠＄悊\ClsSc_MouldMaintainBillMain.cs" />
<Compile Include="鐢熶骇绠＄悊\妯″叿绠＄悊\ClsSc_MouldMaintainBillSub.cs" />
<Compile Include="鐢熶骇绠＄悊\妯″叿绠＄悊\ClsSc_MouldMaintainPlanBillMain.cs" />
@@ -569,10 +592,31 @@
<Compile Include="鐢熶骇绠＄悊\妯″叿绠＄悊\ClsSc_MouldReportBillSub.cs" />
<Compile Include="鐢熶骇绠＄悊\妯″叿绠＄悊\ClsSc_MouldScrapRequestBillMain.cs" />
<Compile Include="鐢熶骇绠＄悊\妯″叿绠＄悊\ClsSc_MouldScrapRequestBillSub.cs" />
+ <Compile Include="鐢熶骇绠＄悊\妯″叿绠＄悊\ClsSc_MouldStatusChangeBillMain.cs" />
+ <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="璐ㄦ绠＄悊\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" />
+ <Compile Include="杞﹂棿绠＄悊\ClsSc_ProcExchSendWorkBillSub.cs" />
+ <Compile Include="杞﹂棿绠＄悊\ClsSc_ProcExchWorkBackBillSub.cs" />
+ <Compile Include="杞﹂棿绠＄悊\ClsSc_ProcExchWorkBackBillMain.cs" />
+ <Compile Include="鐢熶骇绠＄悊\璁惧绠＄悊\ClsSb_EquipWorkBeforeCheckBillMain.cs" />
+ <Compile Include="鐢熶骇绠＄悊\璁惧绠＄悊\ClsSb_EquipWorkBeforeCheckBillSub.cs" />
+ <Compile Include="鐢熶骇绠＄悊\璁惧绠＄悊\ClsSb_EquipStockInCheckBillSub.cs" />
+ <Compile Include="鐢熶骇绠＄悊\璁惧绠＄悊\ClsSb_EquipStockInCheckBillMain.cs" />
<Compile Include="鐢熶骇绠＄悊\璁惧绠＄悊\ClsSb_EquipDotCheckBillMain.cs" />
<Compile Include="鐢熶骇绠＄悊\璁惧绠＄悊\ClsSb_EquipDotCheckBillSub.cs" />
<Compile Include="鐢熶骇绠＄悊\璁惧绠＄悊\ClsSb_EquipDotCheckPlanBillMain.cs" />
@@ -596,6 +640,12 @@
<Compile Include="鐢熶骇绠＄悊\璁惧绠＄悊\ClsSb_EquipSparepartsBillSub.cs" />
<Compile Include="鐢熶骇绠＄悊\璁惧绠＄悊\ClsSb_EquipSparepartsChangeBillMain.cs" />
<Compile Include="鐢熶骇绠＄悊\璁惧绠＄悊\ClsSb_EquipSparepartsChangeBillSub.cs" />
+ <Compile Include="鐢熶骇绠＄悊\璁惧绠＄悊\ClsSb_EquipStatusChangeBillMain.cs" />
+ <Compile Include="鐢熶骇绠＄悊\璁惧绠＄悊\ClsSb_EquipStatusChangeBillSub.cs" />
+ <Compile Include="鐢熶骇绠＄悊\璁惧绠＄悊\ClsSb_EquipStockInCheckBillMain.cs" />
+ <Compile Include="鐢熶骇绠＄悊\璁惧绠＄悊\ClsSb_EquipStockInCheckBillSub.cs" />
+ <Compile Include="鐢熶骇绠＄悊\璁惧绠＄悊\ClsSb_EquipWorkBeforeCheckBillMain.cs" />
+ <Compile Include="鐢熶骇绠＄悊\璁惧绠＄悊\ClsSb_EquipWorkBeforeCheckBillSub.cs" />
<Compile Include="鐢熶骇绠＄悊\璁惧绠＄悊\ClsSc_EquipMaintainBillSub_Item.cs" />
<Compile Include="鐢熶骇绠＄悊\璁惧绠＄悊\ClsSc_EquipMaintainPlanBillSub_Item.cs" />
<Compile Include="鐢熶骇绠＄悊\璁惧绠＄悊\ClsSc_ICMOBillMain.cs" />
@@ -603,6 +653,7 @@
<Compile Include="绯荤粺鍏敤\ClsOA_EmpMessageBillModSub.cs" />
<Compile Include="绯荤粺鍏敤\ClsOA_FieldToChangeMain.cs" />
<Compile Include="绯荤粺鍏敤\ClsOA_FieldToChangeSub.cs" />
+ <Compile Include="绯荤粺鍏敤\ClsXt_BillSubType_Model.cs" />
<Compile Include="绯荤粺鍏敤\ClsXt_BillType_Model.cs" />
<Compile Include="绯荤粺鍏敤\ClsXt_ModuleParameterMain.cs" />
<Compile Include="绯荤粺鍏敤\ClsXt_ModuleParameterSub.cs" />
@@ -690,8 +741,11 @@
<Compile Include="杞﹂棿绠＄悊\ClsSc_StationEntrustOutBillSub_Item.cs" />
<Compile Include="杞﹂棿绠＄悊\ClsSc_StationInBillMain.cs" />
<Compile Include="杞﹂棿绠＄悊\ClsSc_StationInBillSub.cs" />
+ <Compile Include="杞﹂棿绠＄悊\ClsQC_TestSampleCheckBillMain.cs" />
<Compile Include="杞﹂棿绠＄悊\ClsSc_StationOutBillMain.cs" />
+ <Compile Include="杞﹂棿绠＄悊\ClsQC_TestSampleCheckBillSub.cs" />
<Compile Include="杞﹂棿绠＄悊\ClsSc_StationOutBillSub.cs" />
+ <Compile Include="杞﹂棿绠＄悊\ClsSc_StationOutBillSub_Emp.cs" />
<Compile Include="杞﹂棿绠＄悊\ClsSc_StationOutBillSub_Item.cs" />
<Compile Include="杞﹂棿绠＄悊\ClsSc_ABJJDMain.cs" />
<Compile Include="杞﹂棿绠＄悊\ClsWW_EntrustWorkOrderBillMain.cs" />
@@ -874,6 +928,12 @@
<Compile Include="閲戣澏鍗曟嵁\閿�鍞鐞哱ClsXs_SeOutStockBackBillSub_K3.cs" />
<Compile Include="閲戣澏鍗曟嵁\閿�鍞鐞哱ClsXs_SeOutStockBillMain_K3.cs" />
<Compile Include="閲戣澏鍗曟嵁\閿�鍞鐞哱ClsXs_SeOutStockBillSub_K3.cs" />
+ <Compile Include="閿�鍞鐞哱ClsKf_ICStockBackBillMain.cs" />
+ <Compile Include="閿�鍞鐞哱ClsKf_ICStockBackBillSub.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" />
@@ -911,6 +971,12 @@
<Compile Include="閿�鍞鐞哱鍗曡瘉绠＄悊\ClsXs_LadingBillSub.cs" />
<Compile Include="閿�鍞鐞哱鍗曡瘉绠＄悊\ClsXs_ShippingAdviceBillMain.cs" />
<Compile Include="閿�鍞鐞哱鍗曡瘉绠＄悊\ClsXs_ShippingAdviceBillSub.cs" />
+ <Compile Include="椤圭洰绠＄悊\ClsPM_WorkPlanMonthBillMain.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" />
--
Gitblit v1.9.1