From 8f85b01eaa919ffd1f0ede38d9e88eb4e3ae80f2 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期四, 22 八月 2024 14:22:48 +0800
Subject: [PATCH] 修复增加设备工艺参数点检 系统参数保存报错 优化异常反馈单 发送消息,增加 标识 已签到-已处理-已验收
---
WarM/WarM.csproj | 90 +++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 86 insertions(+), 4 deletions(-)
diff --git a/WarM/WarM.csproj b/WarM/WarM.csproj
index ff52f38..5771728 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,6 +68,7 @@
<DebugType>pdbonly</DebugType>
<PlatformTarget>x86</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
+ <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="AxInterop.gregn6Lib">
@@ -74,6 +78,7 @@
<HintPath>..\OCX\Interop.gregn6Lib.dll</HintPath>
<EmbedInteropTypes>True</EmbedInteropTypes>
</Reference>
+ <Reference Include="Microsoft.VisualBasic" />
<Reference Include="NPOI, Version=2.1.3.1, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\OCX\NPOI.dll</HintPath>
@@ -94,6 +99,7 @@
<Reference Include="System.Data" />
<Reference Include="System.Drawing" />
<Reference Include="System.EnterpriseServices" />
+ <Reference Include="System.Management" />
<Reference Include="System.Web.Services" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" />
@@ -393,6 +399,12 @@
<Compile Include="浠撳簱绠＄悊\Kf_StockInRequestBillList.designer.cs">
<DependentUpon>Kf_StockInRequestBillList.cs</DependentUpon>
</Compile>
+ <Compile Include="浠撳簱绠＄悊\Kf_SellOutBill_BarCodeNote.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="浠撳簱绠＄悊\Kf_SellOutBill_BarCodeNote.designer.cs">
+ <DependentUpon>Kf_SellOutBill_BarCodeNote.cs</DependentUpon>
+ </Compile>
<Compile Include="瀛樿揣鏍哥畻\CH_OtherStockInCheckCount.cs">
<SubType>Form</SubType>
</Compile>
@@ -687,6 +699,48 @@
<Compile Include="鏉＄爜鎵撳嵃\Frm_Split.Designer.cs">
<DependentUpon>Frm_Split.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_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>
+ </Compile>
+ <Compile Include="鏉＄爜鎵撳嵃\Kf_AGVRequestBill_FastList.designer.cs">
+ <DependentUpon>Kf_AGVRequestBill_FastList.cs</DependentUpon>
+ </Compile>
+ <Compile Include="鏉＄爜鎵撳嵃\Kf_WeighToBarCode_StationOutBill.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="鏉＄爜鎵撳嵃\Kf_WeighToBarCode_StationOutBill.designer.cs">
+ <DependentUpon>Kf_WeighToBarCode_StationOutBill.cs</DependentUpon>
+ </Compile>
+ <Compile Include="鏉＄爜鎵撳嵃\Kf_WeighToBarCode.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="鏉＄爜鎵撳嵃\Kf_WeighToBarCode.designer.cs">
+ <DependentUpon>Kf_WeighToBarCode.cs</DependentUpon>
+ </Compile>
<Compile Include="鏉＄爜鎵撳嵃\Sc_ICMOToBarCode.cs">
<SubType>Form</SubType>
</Compile>
@@ -914,6 +968,10 @@
<DependentUpon>Kf_StockInRequestBillList.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
+ <EmbeddedResource Include="浠撳簱绠＄悊\Kf_SellOutBill_BarCodeNote.resx">
+ <DependentUpon>Kf_SellOutBill_BarCodeNote.cs</DependentUpon>
+ <SubType>Designer</SubType>
+ </EmbeddedResource>
<EmbeddedResource Include="瀛樿揣鏍哥畻\CH_OtherStockInCheckCount.resx">
<DependentUpon>CH_OtherStockInCheckCount.cs</DependentUpon>
<SubType>Designer</SubType>
@@ -932,9 +990,6 @@
</EmbeddedResource>
<EmbeddedResource Include="瀛樿揣鏍哥畻\CH_RedStockOutCheckCount.resx">
<DependentUpon>CH_RedStockOutCheckCount.cs</DependentUpon>
- <SubType>Designer</SubType>
- </EmbeddedResource>
- <EmbeddedResource Include="鎶ヨ〃鍒嗘瀽\Kf_BarCodeBackInfoReport_MaterInOut_BatchNo.resx">
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="鎶ヨ〃鍒嗘瀽\Kf_BarCodeBackInfoReport_MaterInOut_BatchNo_M.resx">
@@ -1113,6 +1168,33 @@
<EmbeddedResource Include="鏉＄爜鎵撳嵃\Frm_Split.resx">
<DependentUpon>Frm_Split.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="鏉＄爜鎵撳嵃\Gy_CusBarCodeBillList.resx">
+ <DependentUpon>Gy_CusBarCodeBillList.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>
+ <SubType>Designer</SubType>
+ </EmbeddedResource>
+ <EmbeddedResource Include="鏉＄爜鎵撳嵃\Kf_WeighToBarCode_StationOutBill.resx">
+ <DependentUpon>Kf_WeighToBarCode_StationOutBill.cs</DependentUpon>
+ <SubType>Designer</SubType>
+ </EmbeddedResource>
+ <EmbeddedResource Include="鏉＄爜鎵撳嵃\Kf_WeighToBarCode.resx">
+ <DependentUpon>Kf_WeighToBarCode.cs</DependentUpon>
+ <SubType>Designer</SubType>
+ </EmbeddedResource>
<EmbeddedResource Include="鏉＄爜鎵撳嵃\Sc_ICMOToBarCode.resx">
<DependentUpon>Sc_ICMOToBarCode.cs</DependentUpon>
<SubType>Designer</SubType>
--
Gitblit v1.9.1