From 23dbc5b616dfa1a2bcb1fa4302637b8df701f43c Mon Sep 17 00:00:00 2001 From: yxj <yxj@hz-kingdee.com> Date: 星期四, 24 四月 2025 13:27:12 +0800 Subject: [PATCH] 1 --- WorkM/WorkM.csproj | 100 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 98 insertions(+), 2 deletions(-) diff --git a/WorkM/WorkM.csproj b/WorkM/WorkM.csproj index 0046d6a..768d92b 100644 --- a/WorkM/WorkM.csproj +++ b/WorkM/WorkM.csproj @@ -10,7 +10,7 @@ <AppDesignerFolder>Properties</AppDesignerFolder> <RootNamespace>WorkM</RootNamespace> <AssemblyName>WorkM</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="AxInterop.grdes6Lib"> @@ -80,6 +84,9 @@ <Reference Include="Interop.gregn6Lib"> <HintPath>..\OCX\Interop.gregn6Lib.dll</HintPath> <EmbedInteropTypes>True</EmbedInteropTypes> + </Reference> + <Reference Include="S7.Net, Version=1.0.0.0, Culture=neutral, PublicKeyToken=d5812d469e84c693, processorArchitecture=MSIL"> + <HintPath>..\packages\S7netplus.0.1.9\lib\net40\S7.Net.dll</HintPath> </Reference> <Reference Include="System" /> <Reference Include="System.Data" /> @@ -106,6 +113,24 @@ </Compile> <Compile Include="鎶ヨ〃鍒嗘瀽\JIT_GetPPBomInfo.designer.cs"> <DependentUpon>JIT_GetPPBomInfo.cs</DependentUpon> + </Compile> + <Compile Include="鎶ヨ〃鍒嗘瀽\Sc_ProcExchangeNoInReport.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Include="鎶ヨ〃鍒嗘瀽\Sc_ProcExchangeNoInReport.designer.cs"> + <DependentUpon>Sc_ProcExchangeNoInReport.cs</DependentUpon> + </Compile> + <Compile Include="鎶ヨ〃鍒嗘瀽\MES_ProdHoursSumReport.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Include="鎶ヨ〃鍒嗘瀽\MES_ProdHoursSumReport.designer.cs"> + <DependentUpon>MES_ProdHoursSumReport.cs</DependentUpon> + </Compile> + <Compile Include="鎶ヨ〃鍒嗘瀽\MES_StationOutProcSumReport.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Include="鎶ヨ〃鍒嗘瀽\MES_StationOutProcSumReport.designer.cs"> + <DependentUpon>MES_StationOutProcSumReport.cs</DependentUpon> </Compile> <Compile Include="鎶ヨ〃鍒嗘瀽\Mes_ProductionLinePackagingList.cs"> <SubType>Form</SubType> @@ -161,6 +186,18 @@ <Compile Include="鎶ヨ〃鍒嗘瀽\Mes_TraceabilityList.Designer.cs"> <DependentUpon>Mes_TraceabilityList.cs</DependentUpon> </Compile> + <Compile Include="鎶ヨ〃鍒嗘瀽\MES_TOBEReceived.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Include="鎶ヨ〃鍒嗘瀽\MES_TOBEReceived.designer.cs"> + <DependentUpon>MES_TOBEReceived.cs</DependentUpon> + </Compile> + <Compile Include="鎶ヨ〃鍒嗘瀽\MES_WORKINProcess.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Include="鎶ヨ〃鍒嗘瀽\MES_WORKINProcess.designer.cs"> + <DependentUpon>MES_WORKINProcess.cs</DependentUpon> + </Compile> <Compile Include="鎶ヨ〃鍒嗘瀽\MES_WIPProcReport _WIP.cs"> <SubType>Form</SubType> </Compile> @@ -196,6 +233,24 @@ </Compile> <Compile Include="鎶ヨ〃鍒嗘瀽\Pt_RadiumCarvingCodeBillList.designer.cs"> <DependentUpon>Pt_RadiumCarvingCodeBillList.cs</DependentUpon> + </Compile> + <Compile Include="鎶ヨ〃鍒嗘瀽\Sc_WareHouseReport.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Include="鎶ヨ〃鍒嗘瀽\Sc_WareHouseReport.Designer.cs"> + <DependentUpon>Sc_WareHouseReport.cs</DependentUpon> + </Compile> + <Compile Include="鎶ヨ〃鍒嗘瀽\Sc_OverProdReport.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Include="鎶ヨ〃鍒嗘瀽\Sc_OverProdReport.Designer.cs"> + <DependentUpon>Sc_OverProdReport.cs</DependentUpon> + </Compile> + <Compile Include="鎶ヨ〃鍒嗘瀽\Sc_WorkShopReport.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Include="鎶ヨ〃鍒嗘瀽\Sc_WorkShopReport.Designer.cs"> + <DependentUpon>Sc_WorkShopReport.cs</DependentUpon> </Compile> <Compile Include="鎶ヨ〃鍒嗘瀽\WMS_BarCodeBackInfoReport.cs"> <SubType>Form</SubType> @@ -388,6 +443,12 @@ </Compile> <Compile Include="娴佽浆鍗$鐞哱MES_StationOutBill.designer.cs"> <DependentUpon>MES_StationOutBill.cs</DependentUpon> + </Compile> + <Compile Include="娴佽浆鍗$鐞哱MES_StationOutBillList_LastProc.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Include="娴佽浆鍗$鐞哱MES_StationOutBillList_LastProc.designer.cs"> + <DependentUpon>MES_StationOutBillList_LastProc.cs</DependentUpon> </Compile> <Compile Include="娴佽浆鍗$鐞哱MES_StationOutBillList_BaoFei.cs"> <SubType>Form</SubType> @@ -869,6 +930,18 @@ <DependentUpon>JIT_GetPPBomInfo.cs</DependentUpon> <SubType>Designer</SubType> </EmbeddedResource> + <EmbeddedResource Include="鎶ヨ〃鍒嗘瀽\Sc_ProcExchangeNoInReport.resx"> + <DependentUpon>Sc_ProcExchangeNoInReport.cs</DependentUpon> + <SubType>Designer</SubType> + </EmbeddedResource> + <EmbeddedResource Include="鎶ヨ〃鍒嗘瀽\MES_ProdHoursSumReport.resx"> + <DependentUpon>MES_ProdHoursSumReport.cs</DependentUpon> + <SubType>Designer</SubType> + </EmbeddedResource> + <EmbeddedResource Include="鎶ヨ〃鍒嗘瀽\MES_StationOutProcSumReport.resx"> + <DependentUpon>MES_StationOutProcSumReport.cs</DependentUpon> + <SubType>Designer</SubType> + </EmbeddedResource> <EmbeddedResource Include="鎶ヨ〃鍒嗘瀽\Mes_ProductionLinePackagingList.resx"> <DependentUpon>Mes_ProductionLinePackagingList.cs</DependentUpon> </EmbeddedResource> @@ -903,6 +976,14 @@ <EmbeddedResource Include="鎶ヨ〃鍒嗘瀽\Mes_TraceabilityList.resx"> <DependentUpon>Mes_TraceabilityList.cs</DependentUpon> </EmbeddedResource> + <EmbeddedResource Include="鎶ヨ〃鍒嗘瀽\MES_TOBEReceived.resx"> + <DependentUpon>MES_TOBEReceived.cs</DependentUpon> + <SubType>Designer</SubType> + </EmbeddedResource> + <EmbeddedResource Include="鎶ヨ〃鍒嗘瀽\MES_WORKINProcess.resx"> + <DependentUpon>MES_WORKINProcess.cs</DependentUpon> + <SubType>Designer</SubType> + </EmbeddedResource> <EmbeddedResource Include="鎶ヨ〃鍒嗘瀽\MES_WIPProcReport _WIP.resx"> <DependentUpon>MES_WIPProcReport _WIP.cs</DependentUpon> <SubType>Designer</SubType> @@ -924,6 +1005,15 @@ </EmbeddedResource> <EmbeddedResource Include="鎶ヨ〃鍒嗘瀽\Pt_RadiumCarvingCodeBillList.resx"> <DependentUpon>Pt_RadiumCarvingCodeBillList.cs</DependentUpon> + </EmbeddedResource> + <EmbeddedResource Include="鎶ヨ〃鍒嗘瀽\Sc_WareHouseReport.resx"> + <DependentUpon>Sc_WareHouseReport.cs</DependentUpon> + </EmbeddedResource> + <EmbeddedResource Include="鎶ヨ〃鍒嗘瀽\Sc_OverProdReport.resx"> + <DependentUpon>Sc_OverProdReport.cs</DependentUpon> + </EmbeddedResource> + <EmbeddedResource Include="鎶ヨ〃鍒嗘瀽\Sc_WorkShopReport.resx"> + <DependentUpon>Sc_WorkShopReport.cs</DependentUpon> </EmbeddedResource> <EmbeddedResource Include="鎶ヨ〃鍒嗘瀽\WMS_BarCodeBackInfoReport.resx"> <DependentUpon>WMS_BarCodeBackInfoReport.cs</DependentUpon> @@ -1052,6 +1142,10 @@ </EmbeddedResource> <EmbeddedResource Include="娴佽浆鍗$鐞哱MES_StationOutBill.resx"> <DependentUpon>MES_StationOutBill.cs</DependentUpon> + <SubType>Designer</SubType> + </EmbeddedResource> + <EmbeddedResource Include="娴佽浆鍗$鐞哱MES_StationOutBillList_LastProc.resx"> + <DependentUpon>MES_StationOutBillList_LastProc.cs</DependentUpon> <SubType>Designer</SubType> </EmbeddedResource> <EmbeddedResource Include="娴佽浆鍗$鐞哱MES_StationOutBillList_BaoFei.resx"> @@ -1357,7 +1451,9 @@ <SubType>Designer</SubType> </EmbeddedResource> </ItemGroup> - <ItemGroup /> + <ItemGroup> + <None Include="packages.config" /> + </ItemGroup> <ItemGroup> <BootstrapperPackage Include="Microsoft.Net.Client.3.5"> <Visible>False</Visible> -- Gitblit v1.9.1