From 58b51d88ad003c57e12b2567f3bbba122dde662a Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期五, 13 十二月 2024 16:53:53 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
Kanban/Kanban.csproj | 78 +++++++++++++++++++++++++++++++--------
1 files changed, 62 insertions(+), 16 deletions(-)
diff --git a/Kanban/Kanban.csproj b/Kanban/Kanban.csproj
index c4bd217..d8b7bf8 100644
--- a/Kanban/Kanban.csproj
+++ b/Kanban/Kanban.csproj
@@ -29,6 +29,8 @@
<IsWebBootstrapper>false</IsWebBootstrapper>
<UseApplicationTrust>false</UseApplicationTrust>
<BootstrapperEnabled>true</BootstrapperEnabled>
+ <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+ <TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -39,6 +41,8 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+ <PlatformTarget>x86</PlatformTarget>
+ <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
@@ -48,8 +52,26 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+ <Prefer32Bit>false</Prefer32Bit>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
+ <PlatformTarget>x86</PlatformTarget>
+ <OutputPath>bin\x86\Debug\</OutputPath>
+ <Prefer32Bit>false</Prefer32Bit>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
+ <PlatformTarget>x86</PlatformTarget>
+ <OutputPath>bin\x86\Release\</OutputPath>
+ <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
+ <Reference Include="AxInterop.gregn6Lib">
+ <HintPath>..\OCX\AxInterop.gregn6Lib.dll</HintPath>
+ </Reference>
+ <Reference Include="Interop.gregn6Lib">
+ <HintPath>..\OCX\Interop.gregn6Lib.dll</HintPath>
+ <EmbedInteropTypes>True</EmbedInteropTypes>
+ </Reference>
<Reference Include="System" />
<Reference Include="System.Data" />
<Reference Include="System.Drawing" />
@@ -82,17 +104,41 @@
<Compile Include="LED\Sc_LEDInfoNote.designer.cs">
<DependentUpon>Sc_LEDInfoNote.cs</DependentUpon>
</Compile>
+ <Compile Include="Sc_CGKB.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="Sc_CGKB.designer.cs">
+ <DependentUpon>Sc_CGKB.cs</DependentUpon>
+ </Compile>
+ <Compile Include="Sc_CJKB.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="Sc_CJKB.designer.cs">
+ <DependentUpon>Sc_CJKB.cs</DependentUpon>
+ </Compile>
<Compile Include="Sc_ProductionLineKB.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="Sc_ProductionLineKB.designer.cs">
<DependentUpon>Sc_ProductionLineKB.cs</DependentUpon>
</Compile>
+ <Compile Include="Sc_QLKB.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="Sc_QLKB.designer.cs">
+ <DependentUpon>Sc_QLKB.cs</DependentUpon>
+ </Compile>
<Compile Include="Sc_WorkshopKB.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="Sc_WorkshopKB.designer.cs">
<DependentUpon>Sc_WorkshopKB.cs</DependentUpon>
+ </Compile>
+ <Compile Include="宸ヤ綅鐪嬫澘\Sc_WGJCKKB.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="宸ヤ綅鐪嬫澘\Sc_WGJCKKB.designer.cs">
+ <DependentUpon>Sc_WGJCKKB.cs</DependentUpon>
</Compile>
<Compile Include="鐢靛瓙鐪嬫澘\KB_WorkShopProdPlanReport.cs">
<SubType>Form</SubType>
@@ -308,12 +354,28 @@
<DependentUpon>Sc_LEDInfoNote.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
+ <EmbeddedResource Include="Sc_CGKB.resx">
+ <DependentUpon>Sc_CGKB.cs</DependentUpon>
+ <SubType>Designer</SubType>
+ </EmbeddedResource>
+ <EmbeddedResource Include="Sc_CJKB.resx">
+ <DependentUpon>Sc_CJKB.cs</DependentUpon>
+ <SubType>Designer</SubType>
+ </EmbeddedResource>
<EmbeddedResource Include="Sc_ProductionLineKB.resx">
<DependentUpon>Sc_ProductionLineKB.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
+ <EmbeddedResource Include="Sc_QLKB.resx">
+ <DependentUpon>Sc_QLKB.cs</DependentUpon>
+ <SubType>Designer</SubType>
+ </EmbeddedResource>
<EmbeddedResource Include="Sc_WorkshopKB.resx">
<DependentUpon>Sc_WorkshopKB.cs</DependentUpon>
+ <SubType>Designer</SubType>
+ </EmbeddedResource>
+ <EmbeddedResource Include="宸ヤ綅鐪嬫澘\Sc_WGJCKKB.resx">
+ <DependentUpon>Sc_WGJCKKB.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="鐢靛瓙鐪嬫澘\KB_WorkShopProdPlanReport.resx">
@@ -426,22 +488,6 @@
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
- <COMReference Include="Axgregn6Lib">
- <Guid>{4018F953-1BFE-441E-8A04-DC8BA1FF060E}</Guid>
- <VersionMajor>6</VersionMajor>
- <VersionMinor>0</VersionMinor>
- <Lcid>0</Lcid>
- <WrapperTool>aximp</WrapperTool>
- <Isolated>False</Isolated>
- </COMReference>
- <COMReference Include="gregn6Lib">
- <Guid>{4018F953-1BFE-441E-8A04-DC8BA1FF060E}</Guid>
- <VersionMajor>6</VersionMajor>
- <VersionMinor>0</VersionMinor>
- <Lcid>0</Lcid>
- <WrapperTool>tlbimp</WrapperTool>
- <Isolated>False</Isolated>
- </COMReference>
<COMReference Include="stdole">
<Guid>{00020430-0000-0000-C000-000000000046}</Guid>
<VersionMajor>2</VersionMajor>
--
Gitblit v1.9.1