From 6b5d94e8697f0e73ea7430b1d7041cca18e76de7 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期三, 28 八月 2024 15:53:48 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
Model/Model.csproj | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/Model/Model.csproj b/Model/Model.csproj
index 6434fc8..b242ef1 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" />
@@ -140,6 +144,7 @@
<Compile Include="CRM\ClsSec_ProductRepairBillSub1.cs" />
<Compile Include="MES\ClsSc_MESBeginWorkBillSub_RelationBill.cs" />
<Compile Include="WMS\ClsWMS_CusBarCodeCheckBillMain.cs" />
+ <Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_TechnologyParameterType_Model .cs" />
<Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_RestDay_Model.cs" />
<Compile Include="璐ㄦ绠$悊\ClsQC_MonthTarGetBillMain.cs" />
<Compile Include="璐ㄦ绠$悊\ClsQC_MonthTarGetBillSub.cs" />
@@ -697,6 +702,7 @@
<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" />
--
Gitblit v1.9.1