From ccae82b323663ad314991a80930c50c87f36ac64 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期四, 26 六月 2025 14:42:02 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
Model/Model.csproj | 70 ++++++++++++++++++++++++++++++++++
1 files changed, 69 insertions(+), 1 deletions(-)
diff --git a/Model/Model.csproj b/Model/Model.csproj
index b325f43..e5bc186 100644
--- a/Model/Model.csproj
+++ b/Model/Model.csproj
@@ -10,7 +10,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Model</RootNamespace>
<AssemblyName>Model</AssemblyName>
- <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileUpgradeFlags>
</FileUpgradeFlags>
<UpgradeBackupLocation>
@@ -41,6 +41,7 @@
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
+ <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
@@ -49,6 +50,7 @@
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
+ <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
<DebugSymbols>true</DebugSymbols>
@@ -57,6 +59,7 @@
<DebugType>full</DebugType>
<PlatformTarget>x86</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
+ <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
<OutputPath>bin\x86\Release\</OutputPath>
@@ -65,6 +68,7 @@
<DebugType>pdbonly</DebugType>
<PlatformTarget>x86</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
+ <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
@@ -92,6 +96,18 @@
<Compile Include="APS\ClsSc_WorkBillMonthSortBillSub.cs" />
<Compile Include="APS\ClsSc_ICMOChangeBillMain.cs" />
<Compile Include="APS\ClsSc_ICMOChangeBillSub.cs" />
+ <Compile Include="ClsGy_PatrolCheckItemMethod_Model.cs" />
+ <Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_PatrolCheckItemClass_Model.cs" />
+ <Compile Include="浠撳簱绠＄悊\ClsKf_WorkShopICStockBillMain.cs" />
+ <Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_MaintainClass_Model.cs" />
+ <Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_PiPeMaterial_Model.cs" />
+ <Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_PiPe_Model.cs" />
+ <Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsEqiupMaterWorkTimes_Model.cs" />
+ <Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_ProjectMoneyClass_Model.cs" />
+ <Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_RepairClass_Model.cs" />
+ <Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_RepairCheckClass_Model.cs" />
+ <Compile Include="鐢熶骇绠＄悊\ClsSc_ShiftsBeginInfoBillMain.cs" />
+ <Compile Include="鐢熶骇绠＄悊\ClsSc_ShiftsBeginInfoBillSub.cs" />
<Compile Include="ClsHR_EmpFosterBillMain.cs" />
<Compile Include="ClsHR_EmpFosterBillSub.cs" />
<Compile Include="ClsHR_EmpUpChangeBillMain.cs" />
@@ -138,6 +154,39 @@
<Compile Include="CRM\ClsSec_ProductRepairBillMain.cs" />
<Compile Include="CRM\ClsSec_ProductRepairBillSub.cs" />
<Compile Include="CRM\ClsSec_ProductRepairBillSub1.cs" />
+ <Compile Include="Exceptions\Gy_GroupException.cs" />
+ <Compile Include="MES\ClsSc_MESBeginWorkBillSub_RelationBill.cs" />
+ <Compile Include="WMS\ClsWMS_CusBarCodeCheckBillMain.cs" />
+ <Compile Include="鍣ㄥ叿绠＄悊\ClsSc_MouldBatchWorkCheckBillMain.cs" />
+ <Compile Include="鍣ㄥ叿绠＄悊\ClsSc_MouldBatchWorkCheckBillSub.cs" />
+ <Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_EnvironmentTestItem_Model.cs" />
+ <Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_TechnologyParameterType_Model .cs" />
+ <Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_RestDay_Model.cs" />
+ <Compile Include="鐢熶骇绠＄悊\瀹㈡埛鏍囩\ClsSc_CustomerTagInfoMain.cs" />
+ <Compile Include="鐢熶骇绠＄悊\瀹㈡埛鏍囩\ClsSc_CustomerTagInfoSub.cs" />
+ <Compile Include="鐢熶骇绠＄悊\鎺掍骇瑙ｉ攣鐢宠鍗昞ClsJIT_UnLockRequestBillMain.cs" />
+ <Compile Include="鐢熶骇绠＄悊\鎺掍骇瑙ｉ攣鐢宠鍗昞ClsJIT_UnLockRequestBillSub.cs" />
+ <Compile Include="鐢熶骇绠＄悊\鎺掍骇閿佸畾鐢宠鍗昞ClsJIT_LockRequestBillMain.cs" />
+ <Compile Include="鐢熶骇绠＄悊\鎺掍骇閿佸畾鐢宠鍗昞ClsJIT_LockRequestBillSub.cs" />
+ <Compile Include="鐢熶骇绠＄悊\妯″叿绠＄悊\ClsSc_MouldMaintainPlanBillSub_Plan.cs" />
+ <Compile Include="鐢熶骇绠＄悊\鐢熶骇棰嗘枡\ClsKf_ProductReceiveMaterialBillMain.cs" />
+ <Compile Include="鐢熶骇绠＄悊\鐢熶骇棰嗘枡\ClsKf_ProductReceiveMaterialBillSub.cs" />
+ <Compile Include="鐢熶骇绠＄悊\璁惧绠＄悊\ClsSb_EquipPatrolCheckPlanBillSub.cs" />
+ <Compile Include="鐢熶骇绠＄悊\璁惧绠＄悊\ClsSb_EquipPatrolCheckPlanBillMain.cs" />
+ <Compile Include="鐢熶骇绠＄悊\璁惧绠＄悊\ClsSb_EquipPatrolCheckBillSub.cs" />
+ <Compile Include="鐢熶骇绠＄悊\璁惧绠＄悊\ClsSb_EquipPatrolCheckBillMain.cs" />
+ <Compile Include="绯荤粺鍏敤\ClsXt_DefineBillMainSetSub.cs" />
+ <Compile Include="绯荤粺鍏敤\ClsXt_DefineBillMainSetMain.cs" />
+ <Compile Include="璁″垝绠＄悊\ClsGy_SourceMouldBillMain.cs" />
+ <Compile Include="璁″垝绠＄悊\ClsGy_SourceMouldBillSub.cs" />
+ <Compile Include="璐ㄦ绠＄悊\ClsQC_EnvironmentTestDotCheckBillMain.cs" />
+ <Compile Include="璐ㄦ绠＄悊\ClsQC_EnvironmentTestDotCheckBillSub.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" />
@@ -477,6 +526,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" />
@@ -656,6 +707,8 @@
<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" />
@@ -679,14 +732,21 @@
<Compile Include="璐ㄦ绠＄悊\ClsQC_ProcessCheckBillSub_ValueGrid.cs" />
<Compile Include="璐ㄦ绠＄悊\ClsCrm_CustomerAppealBillSub.cs" />
<Compile Include="璐ㄦ绠＄悊\ClsCrm_CustomerAppealBillMain.cs" />
+ <Compile Include="璐ㄦ绠＄悊\ClsGy_EnvironmentTestSchemeBillMain.cs" />
<Compile Include="杞﹂棿绠＄悊\ClsGy_MaterPreventErrMouldBillMain.cs" />
+ <Compile Include="璐ㄦ绠＄悊\ClsGy_EnvironmentTestSchemeBillSub.cs" />
<Compile Include="杞﹂棿绠＄悊\ClsQc_PreventErrMouldCheckBillMain.cs" />
<Compile Include="杞﹂棿绠＄悊\ClsGy_WorkBeginDotCheckListBillMain.cs" />
+ <Compile Include="杞﹂棿绠＄悊\ClsCJ_WIPBeginStockBillMain.cs" />
+ <Compile Include="杞﹂棿绠＄悊\ClsCJ_WIPBeginStockBillSub.cs" />
+ <Compile Include="杞﹂棿绠＄悊\ClsSc_ProcessExchangeBillSub_BatchSplit.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="杞﹂棿绠＄悊\ClsCj_CenterCheckBillMain.cs" />
+ <Compile Include="杞﹂棿绠＄悊\ClsCj_CenterCheckBillSub.cs" />
<Compile Include="杞﹂棿绠＄悊\Sc_AssemblyBill_BindSourceTemp.cs" />
<Compile Include="杞﹂棿绠＄悊\ClsSc_ProcExchRecordBackBillMain.cs" />
<Compile Include="杞﹂棿绠＄悊\ClsSc_ProcExchRecordBackBillSub.cs" />
@@ -903,6 +963,10 @@
<Compile Include="閲囪喘绠＄悊\ClsWW_PPBomBillSub.cs" />
<Compile Include="閲囪喘绠＄悊\ClsCg_PayableBillMain.cs" />
<Compile Include="閲囪喘绠＄悊\ClsCg_PayableSub.cs" />
+ <Compile Include="閲囪喘绠＄悊\ClsCg_POStockInChangeBillMain.cs" />
+ <Compile Include="閲囪喘绠＄悊\ClsCg_POStockInChangeBillSub.cs" />
+ <Compile Include="閲囪喘绠＄悊\ClsCg_POOrderChangeBillMain.cs" />
+ <Compile Include="閲囪喘绠＄悊\ClsCg_POOrderChangeBillSub.cs" />
<Compile Include="閲囪喘绠＄悊\Sup_SendGoodsBillMain.cs" />
<Compile Include="閲囪喘绠＄悊\Sup_SendGoodsBillSub.cs" />
<Compile Include="閲戣澏CLOUD鍗曟嵁\浠撳簱绠＄悊\ClsKf_EntrustInBackBillMain_CLD.cs" />
@@ -1011,6 +1075,8 @@
<Compile Include="閲戣澏鍗曟嵁\閿�鍞鐞哱ClsXs_SeOutStockBackBillSub_K3.cs" />
<Compile Include="閲戣澏鍗曟嵁\閿�鍞鐞哱ClsXs_SeOutStockBillMain_K3.cs" />
<Compile Include="閲戣澏鍗曟嵁\閿�鍞鐞哱ClsXs_SeOutStockBillSub_K3.cs" />
+ <Compile Include="閿�鍞鐞哱ClsXs_OutDoorBillMain.cs" />
+ <Compile Include="閿�鍞鐞哱ClsXs_OutDoorBillSub.cs" />
<Compile Include="閿�鍞鐞哱ClsXs_SellOutChangeBillSub.cs" />
<Compile Include="閿�鍞鐞哱ClsXs_SellOutChangeBillMain.cs" />
<Compile Include="閿�鍞鐞哱ClsKf_ICStockBackBillMain.cs" />
@@ -1041,6 +1107,8 @@
<Compile Include="閿�鍞鐞哱ClsXs_SellPlanExecuteBillMain.cs" />
<Compile Include="閿�鍞鐞哱ClsXs_SellPlanExecuteBillSub.cs" />
<Compile Include="閿�鍞鐞哱ClsXs_OutDoorCheckBillMain.cs" />
+ <Compile Include="閿�鍞鐞哱ClsCrm_ComplainVisitBillMain.cs" />
+ <Compile Include="閿�鍞鐞哱ClsCrm_ComplainVisitBillSub.cs" />
<Compile Include="閿�鍞鐞哱ClsXs_SeQuotation_ccjgBillMain.cs" />
<Compile Include="閿�鍞鐞哱ClsXs_SeQuotation_ccjgBillSub.cs" />
<Compile Include="閿�鍞鐞哱ClsXs_SeDownStockBillMain.cs" />
--
Gitblit v1.9.1