From c3b14901031d985ef750027d4952264369a1d7b0 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期一, 02 三月 2026 10:26:21 +0800
Subject: [PATCH] 1
---
WarM/WarM.csproj | 163 ++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 150 insertions(+), 13 deletions(-)
diff --git a/WarM/WarM.csproj b/WarM/WarM.csproj
index 7128fe9..30c53df 100644
--- a/WarM/WarM.csproj
+++ b/WarM/WarM.csproj
@@ -10,7 +10,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>WarM</RootNamespace>
<AssemblyName>WarM</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,35 +68,48 @@
<DebugType>pdbonly</DebugType>
<PlatformTarget>x86</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
+ <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="AxInterop.gregn6Lib">
<HintPath>..\OCX\AxInterop.gregn6Lib.dll</HintPath>
</Reference>
+ <Reference Include="BouncyCastle.Crypto, Version=1.8.9.0, Culture=neutral, PublicKeyToken=0e99375e54769942, processorArchitecture=MSIL">
+ <HintPath>..\packages\Portable.BouncyCastle.1.8.9\lib\net40\BouncyCastle.Crypto.dll</HintPath>
+ </Reference>
+ <Reference Include="ICSharpCode.SharpZipLib, Version=1.3.2.10, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
+ <HintPath>..\packages\SharpZipLib.1.3.2\lib\net45\ICSharpCode.SharpZipLib.dll</HintPath>
+ </Reference>
<Reference Include="Interop.gregn6Lib">
<HintPath>..\OCX\Interop.gregn6Lib.dll</HintPath>
<EmbedInteropTypes>True</EmbedInteropTypes>
</Reference>
- <Reference Include="NPOI, Version=2.1.3.1, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\OCX\NPOI.dll</HintPath>
+ <Reference Include="M2Mqtt.Net, Version=4.3.0.0, Culture=neutral, processorArchitecture=MSIL">
+ <HintPath>..\packages\M2Mqtt.4.3.0.0\lib\net45\M2Mqtt.Net.dll</HintPath>
</Reference>
- <Reference Include="NPOI.OOXML, Version=2.1.3.1, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
+ <Reference Include="Microsoft.VisualBasic" />
+ <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\OCX\NPOI.OOXML.dll</HintPath>
+ <HintPath>dll\Newtonsoft.Json.dll</HintPath>
</Reference>
- <Reference Include="NPOI.OpenXml4Net, Version=2.1.3.1, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\OCX\NPOI.OpenXml4Net.dll</HintPath>
+ <Reference Include="NPOI, Version=2.5.5.0, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
+ <HintPath>..\packages\NPOI.2.5.5\lib\net45\NPOI.dll</HintPath>
</Reference>
- <Reference Include="NPOI.OpenXmlFormats, Version=2.1.3.1, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\OCX\NPOI.OpenXmlFormats.dll</HintPath>
+ <Reference Include="NPOI.OOXML, Version=2.5.5.0, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
+ <HintPath>..\packages\NPOI.2.5.5\lib\net45\NPOI.OOXML.dll</HintPath>
+ </Reference>
+ <Reference Include="NPOI.OpenXml4Net, Version=2.5.5.0, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
+ <HintPath>..\packages\NPOI.2.5.5\lib\net45\NPOI.OpenXml4Net.dll</HintPath>
+ </Reference>
+ <Reference Include="NPOI.OpenXmlFormats, Version=2.5.5.0, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
+ <HintPath>..\packages\NPOI.2.5.5\lib\net45\NPOI.OpenXmlFormats.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Data" />
<Reference Include="System.Drawing" />
<Reference Include="System.EnterpriseServices" />
+ <Reference Include="System.Management" />
+ <Reference Include="System.Printing" />
<Reference Include="System.Web.Services" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" />
@@ -687,17 +703,89 @@
<Compile Include="鎶ヨ〃鍒嗘瀽\Sc_QueryReadyRptNoInStockReport.designer.cs">
<DependentUpon>Sc_QueryReadyRptNoInStockReport.cs</DependentUpon>
</Compile>
+ <Compile Include="鏁版嵁瀵煎叆\Gy_DataIn_UpDateBarCodeStatus.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="鏁版嵁瀵煎叆\Gy_DataIn_UpDateBarCodeStatus.designer.cs">
+ <DependentUpon>Gy_DataIn_UpDateBarCodeStatus.cs</DependentUpon>
+ </Compile>
<Compile Include="鏉＄爜鎵撳嵃\Frm_Split.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="鏉＄爜鎵撳嵃\Frm_Split.Designer.cs">
<DependentUpon>Frm_Split.cs</DependentUpon>
</Compile>
+ <Compile Include="鏉＄爜鎵撳嵃\Gy_BarCodeBill_automaticallyByPLC_New_Change.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="鏉＄爜鎵撳嵃\Gy_BarCodeBill_automaticallyByPLC_New_Change.designer.cs">
+ <DependentUpon>Gy_BarCodeBill_automaticallyByPLC_New_Change.cs</DependentUpon>
+ </Compile>
+ <Compile Include="鏉＄爜鎵撳嵃\Gy_BarCodeBill_XB_SelectMater.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="鏉＄爜鎵撳嵃\Gy_BarCodeBill_XB_SelectMater.designer.cs">
+ <DependentUpon>Gy_BarCodeBill_XB_SelectMater.cs</DependentUpon>
+ </Compile>
+ <Compile Include="鏉＄爜鎵撳嵃\Gy_BarCodeBill_Rework.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="鏉＄爜鎵撳嵃\Gy_BarCodeBill_Rework.designer.cs">
+ <DependentUpon>Gy_BarCodeBill_Rework.cs</DependentUpon>
+ </Compile>
+ <Compile Include="鏉＄爜鎵撳嵃\Gy_BarCodeBill_XiaBao.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="鏉＄爜鎵撳嵃\Gy_BarCodeBill_XiaBao.designer.cs">
+ <DependentUpon>Gy_BarCodeBill_XiaBao.cs</DependentUpon>
+ </Compile>
+ <Compile Include="鏉＄爜鎵撳嵃\Gy_CusBarCodeBillList.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="鏉＄爜鎵撳嵃\Gy_CusBarCodeBillList.designer.cs">
+ <DependentUpon>Gy_CusBarCodeBillList.cs</DependentUpon>
+ </Compile>
+ <Compile Include="鏉＄爜鎵撳嵃\Gy_BarCodeBill_New.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="鏉＄爜鎵撳嵃\Gy_BarCodeBill_New.designer.cs">
+ <DependentUpon>Gy_BarCodeBill_New.cs</DependentUpon>
+ </Compile>
+ <Compile Include="鏉＄爜鎵撳嵃\Gy_CusBarCodeBill_KaiBei_LianXiang.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="鏉＄爜鎵撳嵃\Gy_CusBarCodeBill_KaiBei_LianXiang.designer.cs">
+ <DependentUpon>Gy_CusBarCodeBill_KaiBei_LianXiang.cs</DependentUpon>
+ </Compile>
+ <Compile Include="鏉＄爜鎵撳嵃\Gy_CusBarCodeBill_KaiBei_HuaSan.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="鏉＄爜鎵撳嵃\Gy_CusBarCodeBill_KaiBei_HuaSan.designer.cs">
+ <DependentUpon>Gy_CusBarCodeBill_KaiBei_HuaSan.cs</DependentUpon>
+ </Compile>
+ <Compile Include="鏉＄爜鎵撳嵃\Gy_CusBarCodeBill_KaiBei_LangChao.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="鏉＄爜鎵撳嵃\Gy_CusBarCodeBill_KaiBei_LangChao.designer.cs">
+ <DependentUpon>Gy_CusBarCodeBill_KaiBei_LangChao.cs</DependentUpon>
+ </Compile>
+ <Compile Include="鏉＄爜鎵撳嵃\Gy_CusBarCodeBill_KaiBei.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="鏉＄爜鎵撳嵃\Gy_CusBarCodeBill_KaiBei.designer.cs">
+ <DependentUpon>Gy_CusBarCodeBill_KaiBei.cs</DependentUpon>
+ </Compile>
<Compile Include="鏉＄爜鎵撳嵃\Gy_BarCodeBill_automaticallyByPLC_New.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="鏉＄爜鎵撳嵃\Gy_BarCodeBill_automaticallyByPLC_New.designer.cs">
<DependentUpon>Gy_BarCodeBill_automaticallyByPLC_New.cs</DependentUpon>
+ </Compile>
+ <Compile Include="鏉＄爜鎵撳嵃\Gy_PackBarCodeBill_automaticallyByPLC.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="鏉＄爜鎵撳嵃\Gy_PackBarCodeBill_automaticallyByPLC.Designer.cs">
+ <DependentUpon>Gy_PackBarCodeBill_automaticallyByPLC.cs</DependentUpon>
</Compile>
<Compile Include="鏉＄爜鎵撳嵃\Kf_AGVRequestBill_FastList.cs">
<SubType>Form</SubType>
@@ -1141,12 +1229,56 @@
<DependentUpon>Sc_QueryReadyRptNoInStockReport.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
+ <EmbeddedResource Include="鏁版嵁瀵煎叆\Gy_DataIn_UpDateBarCodeStatus.resx">
+ <DependentUpon>Gy_DataIn_UpDateBarCodeStatus.cs</DependentUpon>
+ <SubType>Designer</SubType>
+ </EmbeddedResource>
<EmbeddedResource Include="鏉＄爜鎵撳嵃\Frm_Split.resx">
<DependentUpon>Frm_Split.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="鏉＄爜鎵撳嵃\Gy_BarCodeBill_automaticallyByPLC_New_Change.resx">
+ <DependentUpon>Gy_BarCodeBill_automaticallyByPLC_New_Change.cs</DependentUpon>
+ <SubType>Designer</SubType>
+ </EmbeddedResource>
+ <EmbeddedResource Include="鏉＄爜鎵撳嵃\Gy_BarCodeBill_XB_SelectMater.resx">
+ <DependentUpon>Gy_BarCodeBill_XB_SelectMater.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="鏉＄爜鎵撳嵃\Gy_BarCodeBill_Rework.resx">
+ <DependentUpon>Gy_BarCodeBill_Rework.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="鏉＄爜鎵撳嵃\Gy_BarCodeBill_XiaBao.resx">
+ <DependentUpon>Gy_BarCodeBill_XiaBao.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="鏉＄爜鎵撳嵃\Gy_CusBarCodeBillList.resx">
+ <DependentUpon>Gy_CusBarCodeBillList.cs</DependentUpon>
+ <SubType>Designer</SubType>
+ </EmbeddedResource>
+ <EmbeddedResource Include="鏉＄爜鎵撳嵃\Gy_BarCodeBill_New.resx">
+ <DependentUpon>Gy_BarCodeBill_New.cs</DependentUpon>
+ <SubType>Designer</SubType>
+ </EmbeddedResource>
+ <EmbeddedResource Include="鏉＄爜鎵撳嵃\Gy_CusBarCodeBill_KaiBei_LianXiang.resx">
+ <DependentUpon>Gy_CusBarCodeBill_KaiBei_LianXiang.cs</DependentUpon>
+ <SubType>Designer</SubType>
+ </EmbeddedResource>
+ <EmbeddedResource Include="鏉＄爜鎵撳嵃\Gy_CusBarCodeBill_KaiBei_HuaSan.resx">
+ <DependentUpon>Gy_CusBarCodeBill_KaiBei_HuaSan.cs</DependentUpon>
+ <SubType>Designer</SubType>
+ </EmbeddedResource>
+ <EmbeddedResource Include="鏉＄爜鎵撳嵃\Gy_CusBarCodeBill_KaiBei_LangChao.resx">
+ <DependentUpon>Gy_CusBarCodeBill_KaiBei_LangChao.cs</DependentUpon>
+ <SubType>Designer</SubType>
+ </EmbeddedResource>
+ <EmbeddedResource Include="鏉＄爜鎵撳嵃\Gy_CusBarCodeBill_KaiBei.resx">
+ <DependentUpon>Gy_CusBarCodeBill_KaiBei.cs</DependentUpon>
+ <SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="鏉＄爜鎵撳嵃\Gy_BarCodeBill_automaticallyByPLC_New.resx">
<DependentUpon>Gy_BarCodeBill_automaticallyByPLC_New.cs</DependentUpon>
<SubType>Designer</SubType>
+ </EmbeddedResource>
+ <EmbeddedResource Include="鏉＄爜鎵撳嵃\Gy_PackBarCodeBill_automaticallyByPLC.resx">
+ <DependentUpon>Gy_PackBarCodeBill_automaticallyByPLC.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="鏉＄爜鎵撳嵃\Kf_AGVRequestBill_FastList.resx">
<DependentUpon>Kf_AGVRequestBill_FastList.cs</DependentUpon>
@@ -1182,6 +1314,8 @@
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
+ <None Include="libman.json" />
+ <None Include="packages.config" />
<None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
@@ -1228,9 +1362,12 @@
<Project>{0a4ef483-d8d3-49a5-8378-974ef7993365}</Project>
<Name>SQLHelper</Name>
</ProjectReference>
+ <ProjectReference Include="..\WebAPI\WebAPI.csproj">
+ <Project>{5b60ce0c-963c-4dc2-91b3-0b471aac5438}</Project>
+ <Name>WebAPI</Name>
+ </ProjectReference>
</ItemGroup>
<ItemGroup>
- <Folder Include="鏁版嵁瀵煎叆\" />
<Folder Include="閲戣澏浠撳簱绠＄悊\" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
--
Gitblit v1.9.1