From 176c90cddfb8c43674e889d89b86cd979e94e65a Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期二, 10 九月 2024 18:36:43 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
DAL/DAL.csproj | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 55 insertions(+), 1 deletions(-)
diff --git a/DAL/DAL.csproj b/DAL/DAL.csproj
index 59eee65..c4b1bb4 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" />
@@ -82,27 +86,47 @@
<Compile Include="ClsPay_WorkErrTimesBill.cs" />
<Compile Include="ClsPM_ProjectEndBillMain.cs" />
<Compile Include="ClsPM_ProjectBeginBillMain.cs" />
+ <Compile Include="Cls锘縋M_WorkTaskMoneyBillMain.cs" />
<Compile Include="ClsPM_ProjectMoneyBillMain.cs" />
<Compile Include="ClsPM_CustomerTaskBillMain.cs" />
<Compile Include="ClsGy_MaterialMouldBillMain.cs" />
<Compile Include="ClsPM_WorkPlanMonthBillMain.cs" />
+ <Compile Include="婧愬崟\InterFace婧愬崟\Cls_S_IF_ICMOReportBillList_CusBarCodeBill.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" />
<Compile Include="浜轰簨绠＄悊\ClsHR_EmpUpChangeBill.cs" />
+ <Compile Include="浠撳簱绠＄悊\ClsSc_ProductionReturnBill.cs" />
<Compile Include="浠撳簱绠＄悊\ClsKf_StepFoldInBill.cs" />
<Compile Include="浠撳簱绠＄悊\ClsKf_StepFoldOutBill.cs" />
<Compile Include="浠撳簱绠＄悊\ClsKf_SellOutBillForLayUI.cs" />
<Compile Include="浠撳簱绠＄悊\鏉＄爜绠＄悊\ClsGy_BarCodeBill_ChaiMa.cs" />
<Compile Include="浠撳簱绠＄悊\鏉＄爜绠＄悊\ClsKF_BarCodeStatusChangeBill.cs" />
+ <Compile Include="淇℃伅骞冲彴\ClsOA_ErrMsgBackCheckBill.cs" />
+ <Compile Include="淇℃伅骞冲彴\ClsOA_ErrMsgBackHandleBill.cs" />
+ <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" />
<Compile Include="鍩虹璧勬枡\鍏敤鍩虹璧勬枡\ClsGy_CardStatus_Ctl.cs" />
<Compile Include="鍩虹璧勬枡\鍏敤鍩虹璧勬枡\ClsGy_CardAddress_Ctl.cs" />
<Compile Include="鍩虹璧勬枡\鍏敤鍩虹璧勬枡\ClsGy_CustLocation_Ctl.cs" />
+ <Compile Include="鍩虹璧勬枡\鍏敤鍩虹璧勬枡\ClsGy_DotCheckItemMethod_Ctl.cs" />
<Compile Include="鍩虹璧勬枡\鍏敤鍩虹璧勬枡\ClsGy_EquipStatus_Ctl.cs" />
<Compile Include="鍩虹璧勬枡\鍏敤鍩虹璧勬枡\ClsGy_CardType_Ctl.cs" />
+ <Compile Include="鍩虹璧勬枡\鍏敤鍩虹璧勬枡\ClsGy_DotCheckItemClass_Ctl.cs" />
<Compile Include="鍩虹璧勬枡\鍏敤鍩虹璧勬枡\ClsGy_MouldStatus_Ctl.cs" />
<Compile Include="鍩虹璧勬枡\鍏敤鍩虹璧勬枡\ClsGy_Operator_Ctl.cs" />
<Compile Include="鍩虹璧勬枡\鍏敤鍩虹璧勬枡\ClsGy_RateType_Ctl.cs" />
@@ -122,7 +146,12 @@
<Compile Include="鍩虹璧勬枡\鍏朵粬鍩虹璧勬枡\ClsGy_QCCheckProject_View.cs" />
<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" />
@@ -626,7 +655,11 @@
<Compile Include="鐢熶骇绠＄悊\妯″叿绠＄悊\ClsSc_MouldStatusChangeBill.cs" />
<Compile Include="鐢熶骇绠＄悊\璁惧绠＄悊\ClsGy_EquipFileMain.cs" />
<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" />
<Compile Include="鐢熶骇绠＄悊\璁惧绠＄悊\ClsSb_EquipStockInCheckBill.cs" />
<Compile Include="鐢熶骇绠＄悊\璁惧绠＄悊\ClsSb_EquipSparepartsBill.cs" />
@@ -637,6 +670,14 @@
<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" />
+ <Compile Include="璐ㄦ绠＄悊\ClsQC_NoPassProdRequestBill.cs" />
<Compile Include="璐ㄦ绠＄悊\ClsQC_FirstPieceCheckBill.cs" />
<Compile Include="璐ㄦ绠＄悊\ClsQC_LastPieceCheckBill.cs" />
<Compile Include="璐ㄦ绠＄悊\ClsQC_NoPassProdCheckBill.cs" />
@@ -646,6 +687,11 @@
<Compile Include="璐ㄦ绠＄悊\ClsQC_ProcessCheckBill.cs" />
<Compile Include="璐ㄦ绠＄悊\ClsQC_ProdReportCheckBill.cs" />
<Compile Include="璐ㄦ绠＄悊\ClsCrm_CustomerAppealBill.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" />
<Compile Include="杞﹂棿绠＄悊\ClsSc_ProcExchWorkBackBill.cs" />
@@ -766,6 +812,7 @@
<Compile Include="閿�鍞鐞哱ClsKf_ICStockBackBill.cs" />
<Compile Include="閿�鍞鐞哱ClsXs_SellOutChangeBill.cs" />
<Compile Include="閿�鍞鐞哱ClsXs_ReceivableBill.cs" />
+ <Compile Include="閿�鍞鐞哱ClsXs_OutDoorCheckBill.cs" />
<Compile Include="閿�鍞鐞哱ClsXs_SeOrderChangeBill.cs" />
<Compile Include="閿�鍞鐞哱ClsXs_ExceptiveCheckRequestBill.cs" />
<Compile Include="閿�鍞鐞哱ClsXs_ContractBill.cs" />
@@ -793,6 +840,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" />
@@ -1145,6 +1193,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">
@@ -1165,6 +1215,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