From 770c739aeadfd1025bd6b64aa6790201b0b1047d Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期二, 22 四月 2025 13:02:59 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
DAL/DAL.csproj | 51 ++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 50 insertions(+), 1 deletions(-)
diff --git a/DAL/DAL.csproj b/DAL/DAL.csproj
index 7ca8351..7a7f1c5 100644
--- a/DAL/DAL.csproj
+++ b/DAL/DAL.csproj
@@ -10,7 +10,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>DAL</RootNamespace>
<AssemblyName>DAL</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" />
@@ -76,6 +80,11 @@
<ItemGroup>
<Compile Include="APS\ClsSc_WorkBillMonthSortBill.cs" />
<Compile Include="APS\ClsSc_ICMOChangeBill.cs" />
+ <Compile Include="鍩虹璧勬枡\鍏敤鍩虹璧勬枡\ClsGy_MaintainClass_Ctl.cs" />
+ <Compile Include="鍩虹璧勬枡\鍏敤鍩虹璧勬枡\ClsGy_RepairClass_Ctl.cs" />
+ <Compile Include="鍩虹璧勬枡\鍏敤鍩虹璧勬枡\ClsGy_RepairCheckClass_Ctl.cs" />
+ <Compile Include="浠撳簱绠＄悊\ClsKf_ProductReceiveMaterialBill.cs" />
+ <Compile Include="鐢熶骇绠＄悊\ClsSc_ShiftsBeginInfoBill.cs" />
<Compile Include="ClsPay_AbsentBill.cs" />
<Compile Include="ClsPay_EarlyLateErrBill.cs" />
<Compile Include="ClsPay_RewardPunishBill.cs" />
@@ -87,6 +96,17 @@
<Compile Include="ClsPM_CustomerTaskBillMain.cs" />
<Compile Include="ClsGy_MaterialMouldBillMain.cs" />
<Compile Include="ClsPM_WorkPlanMonthBillMain.cs" />
+ <Compile Include="婧愬崟\InterFace婧愬崟\Cls_S_IF_ICMOBillList_CusBarCodeBill.cs" />
+ <Compile Include="婧愬崟\InterFace婧愬崟\Cls_S_IF_ICMOReportBillList_CusBarCodeBill.cs" />
+ <Compile Include="鐢熶骇绠＄悊\鎺掍骇瑙ｉ攣鐢宠鍗昞ClsJIT_UnLockRequestBill.cs" />
+ <Compile Include="鐢熶骇绠＄悊\鎺掍骇閿佸畾鐢宠鍗昞ClsJIT_LockRequestBill.cs" />
+ <Compile Include="绯荤粺鍏敤\ClsXt_DefineBillMainSet.cs" />
+ <Compile Include="璁″垝绠＄悊\ClsGy_SourceMouldBillMain.cs" />
+ <Compile Include="璐ㄦ绠＄悊\ClsQC_EnvironmentTestDotCheckBillMain.cs" />
+ <Compile Include="璐ㄦ绠＄悊\ClsQC_MonthTarGetBill.cs" />
+ <Compile Include="鐢熶骇绠＄悊\璁惧绠＄悊\ClsSb_EquipRepairSignBill.cs" />
+ <Compile Include="WMS\ClsWMS_CusBarCodeCheckBill.cs" />
+ <Compile Include="璐ㄦ绠＄悊\ClsQC_TakeSampleCheckBill.cs" />
<Compile Include="MES\ClsSc_SourceLineRepairBill.cs" />
<Compile Include="MES\ClsSc_MESMaterToSourceBill .cs" />
<Compile Include="浜轰簨绠＄悊\ClsHR_EmpFosterBill.cs" />
@@ -102,6 +122,12 @@
<Compile Include="淇℃伅骞冲彴\ClsOA_AndengFlowRuleBill.cs" />
<Compile Include="淇℃伅骞冲彴\ClsOA_ErrMsgBackSignBill.cs" />
<Compile Include="淇℃伅骞冲彴\ClsOA_ErrMsgBackReceiveBill.cs" />
+ <Compile Include="鍏敤\frmHlpBillList1.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="鍏敤\frmHlpBillList1.designer.cs">
+ <DependentUpon>frmHlpBillList1.cs</DependentUpon>
+ </Compile>
<Compile Include="鍩虹璧勬枡\InterFace鍩虹璧勬枡\ClsIF_ORGANIZATIONS_View.cs" />
<Compile Include="鍩虹璧勬枡\鍏敤鍩虹璧勬枡\ClsGy_BadType_Ctl.cs" />
<Compile Include="鍩虹璧勬枡\鍏敤鍩虹璧勬枡\ClsGy_CardChangeType_Ctl.cs" />
@@ -132,8 +158,11 @@
<Compile Include="鍩虹璧勬枡\鍏朵粬鍩虹璧勬枡\ClsGy_StdWorkTimes_Ctl.cs" />
<Compile Include="鍩虹璧勬枡\鍏朵粬鍩虹璧勬枡\ClsGy_SupMaterial_Ctl.cs" />
<Compile Include="宸ヨ祫绠＄悊\ClsHR_EmployeeSkillBill.cs" />
+ <Compile Include="宸ヨ祫绠＄悊\ClsHR_EmployeeSkillExamBill.cs" />
<Compile Include="宸ヨ祫绠＄悊\ClsHR_PostSkillBill.cs" />
+ <Compile Include="婧愬崟\Cls_S_Xt_BaseBill1.cs" />
<Compile Include="婧愬崟\ERP婧愬崟\Cls_S_Sc_ABJJD.cs" />
+ <Compile Include="婧愬崟\InterFace婧愬崟\Cls_S_IFCLD_ICMOList1.cs" />
<Compile Include="婧愬崟\InterFace婧愬崟\Cls_S_IF_ICMOBillList.cs" />
<Compile Include="婧愬崟\InterFace婧愬崟\Cls_S_IF_ProcessReportBillList.cs" />
<Compile Include="婧愬崟\InterFace婧愬崟\Cls_S_IF_PackageDismantleBillList.cs" />
@@ -639,6 +668,7 @@
<Compile Include="鐢熶骇绠＄悊\璁惧绠＄悊\ClsGy_EquipTypeBill.cs" />
<Compile Include="鐢熶骇绠＄悊\璁惧绠＄悊\ClsGy_FixCardChangeBill.cs" />
<Compile Include="鐢熶骇绠＄悊\璁惧绠＄悊\ClsGy_FixCardBill.cs" />
+ <Compile Include="鐢熶骇绠＄悊\璁惧绠＄悊\ClsSB_EquipICMOTechParamBill.cs" />
<Compile Include="鐢熶骇绠＄悊\璁惧绠＄悊\ClsSb_EquipBeginBillMain.cs" />
<Compile Include="鐢熶骇绠＄悊\璁惧绠＄悊\ClsSb_EquipStopBillMain.cs" />
<Compile Include="鐢熶骇绠＄悊\璁惧绠＄悊\ClsSb_EquipWorkBeforeCheckBill.cs" />
@@ -651,6 +681,10 @@
<Compile Include="绯荤粺鍏敤\ClsXt_SystemParameter_Ctl.cs" />
<Compile Include="绯荤粺鍏敤\ClsXt_BillSubType_Ctl.cs" />
<Compile Include="璁″垝绠＄悊\ClsGy_MaterialTechParamBillMain.cs" />
+ <Compile Include="璐ㄦ绠＄悊\ClsQC_BackSampleCheckBill.cs" />
+ <Compile Include="璐ㄦ绠＄悊\ClsQC_PatrolProcCheckOtherBill.cs" />
+ <Compile Include="璐ㄦ绠＄悊\ClsQC_WorkSelfCheckBill.cs" />
+ <Compile Include="璐ㄦ绠＄悊\ClsQC_StockCheckBill.cs" />
<Compile Include="璐ㄦ绠＄悊\ClsQC_NoPassProdConclusionBill.cs" />
<Compile Include="璐ㄦ绠＄悊\ClsQC_NoPassProdDisposeCheckBill.cs" />
<Compile Include="璐ㄦ绠＄悊\ClsQC_NoPassProdDisposeBill.cs" />
@@ -664,8 +698,11 @@
<Compile Include="璐ㄦ绠＄悊\ClsQC_ProcessCheckBill.cs" />
<Compile Include="璐ㄦ绠＄悊\ClsQC_ProdReportCheckBill.cs" />
<Compile Include="璐ㄦ绠＄悊\ClsCrm_CustomerAppealBill.cs" />
+ <Compile Include="璐ㄦ绠＄悊\ClsGy_EnvironmentTestSchemeBillMain.cs" />
<Compile Include="杞﹂棿绠＄悊\ClsGy_MaterPreventErrMouldBillMain.cs" />
<Compile Include="杞﹂棿绠＄悊\ClsQc_PreventErrMouldCheckBillMain.cs" />
+ <Compile Include="杞﹂棿绠＄悊\ClsGy_WorkBeginDotCheckListBillMain.cs" />
+ <Compile Include="杞﹂棿绠＄悊\ClsCJ_WIPBeginStockBill.cs" />
<Compile Include="杞﹂棿绠＄悊\ClsSc_WorkBeginDotCheckBillMain.cs" />
<Compile Include="杞﹂棿绠＄悊\ClsSc_ProcExchRecordBackBill.cs" />
<Compile Include="杞﹂棿绠＄悊\ClsSc_ProcExchSendWorkBill.cs" />
@@ -680,6 +717,7 @@
<Compile Include="杞﹂棿绠＄悊\ClsSc_StationInBill.cs" />
<Compile Include="杞﹂棿绠＄悊\ClsSc_StationOutBill.cs" />
<Compile Include="杞﹂棿绠＄悊\ClsWW_EntrustWorkOrderBill.cs" />
+ <Compile Include="杞﹂棿绠＄悊\ClsCj_CenterCheckBill.cs" />
<Compile Include="閲囪喘绠＄悊\ClsCg_ContractBill.cs">
<SubType>Code</SubType>
</Compile>
@@ -712,6 +750,8 @@
</Compile>
<Compile Include="閲囪喘绠＄悊\ClsWW_PPBomBill.cs" />
<Compile Include="閲囪喘绠＄悊\ClsCg_PayableBill.cs" />
+ <Compile Include="閲囪喘绠＄悊\ClsCg_POStockInChangeBill.cs" />
+ <Compile Include="閲囪喘绠＄悊\ClsCg_POOrderChangeBill.cs" />
<Compile Include="閲囪喘绠＄悊\Sup_SendGoodsBill.cs" />
<Compile Include="鐢熶骇绠＄悊\ClsSc_MateWasterRequestBill.cs" />
<Compile Include="鐢熶骇绠＄悊\ClsSc_WorkStopBill.cs" />
@@ -785,6 +825,7 @@
<Compile Include="杞﹂棿绠＄悊\ClsSc_ProcExchQualityReport.cs" />
<Compile Include="杞﹂棿绠＄悊\ClsSc_ProcExchReport.cs" />
<Compile Include="閿�鍞鐞哱ClsKf_ICStockBackBill.cs" />
+ <Compile Include="閿�鍞鐞哱ClsXs_OutDoorBill.cs" />
<Compile Include="閿�鍞鐞哱ClsXs_SellOutChangeBill.cs" />
<Compile Include="閿�鍞鐞哱ClsXs_ReceivableBill.cs" />
<Compile Include="閿�鍞鐞哱ClsXs_OutDoorCheckBill.cs" />
@@ -802,6 +843,7 @@
<Compile Include="閿�鍞鐞哱ClsXs_SellPlanExecuteBill.cs" />
<Compile Include="閿�鍞鐞哱ClsXs_SeOutStockBackBillForLayUI.cs" />
<Compile Include="閿�鍞鐞哱ClsXs_SeProdPlanBill.cs" />
+ <Compile Include="閿�鍞鐞哱ClsCrm_ComplainVisitBill.cs" />
<Compile Include="閿�鍞鐞哱ClsXs_SeQuotationBill.cs" />
<Compile Include="閿�鍞鐞哱ClsXs_SeQuotation_ccjgBill.cs" />
<Compile Include="閿�鍞鐞哱ClsXs_SeSampleBill.cs" />
@@ -815,6 +857,7 @@
<Compile Include="閿�鍞鐞哱鍗曡瘉绠＄悊\ClsXs_CustomsSplitPackBill.cs" />
<Compile Include="閿�鍞鐞哱鍗曡瘉绠＄悊\ClsXs_LadingBill.cs" />
<Compile Include="閿�鍞鐞哱鍗曡瘉绠＄悊\ClsXs_ShippingAdviceBill.cs" />
+ <Compile Include="椤圭洰绠＄悊\ClsPM_CustomerProInfoBill.cs" />
<Compile Include="椤圭洰绠＄悊\ClsPM_WorkReportWeekBillMain.cs" />
<Compile Include="椤圭洰绠＄悊\ClsPM_WorkTaskWeekBill.cs" />
<Compile Include="椤圭洰绠＄悊\ClsPro_DesignBlueRequestBill.cs" />
@@ -1167,6 +1210,8 @@
<Compile Include="閿�鍞鐞哱ClsXs_SeOrderBill.cs" />
<Compile Include="閿�鍞鐞哱ClsXs_SeOutStockBackBill.cs" />
<Compile Include="閿�鍞鐞哱ClsXs_SeOutStockBill.cs" />
+ <Compile Include="椤圭洰绠＄悊\Cls锘縂y_ProjectMoneyBOMBill.cs" />
+ <Compile Include="椤圭洰绠＄悊\Cls锘縂y_WorkTaskMoneyBOMBill.cs" />
</ItemGroup>
<ItemGroup>
<COMReference Include="stdole">
@@ -1187,6 +1232,10 @@
<DependentUpon>frmHlpBillList.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
+ <EmbeddedResource Include="鍏敤\frmHlpBillList1.resx">
+ <DependentUpon>frmHlpBillList1.cs</DependentUpon>
+ <SubType>Designer</SubType>
+ </EmbeddedResource>
<EmbeddedResource Include="鍏敤\frm_S_BillQueryCondition_New.resx">
<SubType>Designer</SubType>
<DependentUpon>frm_S_BillQueryCondition_New.cs</DependentUpon>
--
Gitblit v1.9.1