From 0a74392a5eba77891c9310413f19c099a4580d82 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期一, 04 十一月 2024 08:15:06 +0800
Subject: [PATCH] iqc

---
 DevApp/Gs.DevApp/Gs.DevApp.csproj |  612 ++++++++++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 514 insertions(+), 98 deletions(-)

diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index c6d4802..ea8e53d 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -11,6 +11,24 @@
     <AssemblyName>Gs.DevApp</AssemblyName>
     <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <PublishUrl>publish\</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -20,7 +38,7 @@
     <OutputPath>bin\Debug\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
+    <WarningLevel>5</WarningLevel>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -31,40 +49,109 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
+  <PropertyGroup>
+    <ApplicationIcon>logo_ico.ico</ApplicationIcon>
+  </PropertyGroup>
+  <PropertyGroup>
+    <NoWin32Manifest>true</NoWin32Manifest>
+  </PropertyGroup>
   <ItemGroup>
-    <Reference Include="DevExpress.BonusSkins.v19.2" />
-    <Reference Include="DevExpress.Charts.v19.2.Core, Version=19.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
-    <Reference Include="DevExpress.Data.v19.2" />
-    <Reference Include="DevExpress.DataAccess.v19.2, Version=19.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-    <Reference Include="DevExpress.Office.v19.2.Core, Version=19.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
-    <Reference Include="DevExpress.Pdf.v19.2.Core, Version=19.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
-    <Reference Include="DevExpress.PivotGrid.v19.2.Core, Version=19.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
-    <Reference Include="DevExpress.RichEdit.v19.2.Core, Version=19.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
-    <Reference Include="DevExpress.RichEdit.v19.2.Export, Version=19.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
-    <Reference Include="DevExpress.Utils.v19.2" />
-    <Reference Include="DevExpress.Sparkline.v19.2.Core" />
-    <Reference Include="DevExpress.Utils.v19.2.UI, Version=19.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-    <Reference Include="DevExpress.XtraBars.v19.2, Version=19.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
-    <Reference Include="DevExpress.XtraCharts.v19.2, Version=19.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
-    <Reference Include="DevExpress.XtraEditors.v19.2" />
-    <Reference Include="DevExpress.Printing.v19.2.Core" />
-    <Reference Include="DevExpress.XtraGauges.v19.2.Core, Version=19.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
-    <Reference Include="DevExpress.XtraGrid.v19.2, Version=19.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
-    <Reference Include="DevExpress.XtraLayout.v19.2, Version=19.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-    <Reference Include="DevExpress.XtraPrinting.v19.2, Version=19.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-    <Reference Include="DevExpress.XtraReports.v19.2, Version=19.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
-    <Reference Include="DevExpress.XtraReports.v19.2.Extensions, Version=19.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-    <Reference Include="DevExpress.XtraTreeList.v19.2, Version=19.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
-    <Reference Include="DevExpress.XtraWizard.v19.2, Version=19.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="AutoUpdater.NET, Version=1.9.2.0, Culture=neutral, PublicKeyToken=501435c91b35f4bc, processorArchitecture=MSIL">
+      <HintPath>..\packages\Autoupdater.NET.Official.1.9.2\lib\net462\AutoUpdater.NET.dll</HintPath>
+    </Reference>
+    <Reference Include="DevExpress.BonusSkins.v22.2" />
+    <Reference Include="DevExpress.Charts.v22.2.Core, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.Drawing.v22.2" />
+    <Reference Include="DevExpress.Data.v22.2" />
+    <Reference Include="DevExpress.DataAccess.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.Images.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.Office.v22.2.Core, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.Pdf.v22.2.Core, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.PivotGrid.v22.2.Core, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.RichEdit.v22.2.Core, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.RichEdit.v22.2.Export, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.Data.Desktop.v22.2" />
+    <Reference Include="DevExpress.Utils.v22.2" />
+    <Reference Include="DevExpress.Sparkline.v22.2.Core" />
+    <Reference Include="DevExpress.Utils.v22.2.UI, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.XtraBars.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.XtraCharts.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.XtraEditors.v22.2" />
+    <Reference Include="DevExpress.Printing.v22.2.Core" />
+    <Reference Include="DevExpress.XtraGauges.v22.2.Core, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.XtraGrid.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.XtraLayout.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.XtraNavBar.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.XtraPrinting.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.XtraReports.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.XtraReports.v22.2.Extensions, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.XtraTreeList.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.XtraWizard.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
     <Reference Include="FastReport">
       <HintPath>D:\GsMesV2\DevApp\Gs.DevApp\bin\Debug\FastReport.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.8.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Web.WebView2.Core, Version=1.0.2592.51, Culture=neutral, PublicKeyToken=2a8ab48044d2601e, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Web.WebView2.1.0.2592.51\lib\net462\Microsoft.Web.WebView2.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Web.WebView2.WinForms, Version=1.0.2592.51, Culture=neutral, PublicKeyToken=2a8ab48044d2601e, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Web.WebView2.1.0.2592.51\lib\net462\Microsoft.Web.WebView2.WinForms.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Web.WebView2.Wpf, Version=1.0.2592.51, Culture=neutral, PublicKeyToken=2a8ab48044d2601e, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Web.WebView2.1.0.2592.51\lib\net462\Microsoft.Web.WebView2.Wpf.dll</HintPath>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
+    <Reference Include="Oracle.ManagedDataAccess, Version=4.122.23.1, Culture=neutral, PublicKeyToken=89b483f429c47342, processorArchitecture=MSIL">
+      <HintPath>..\packages\Oracle.ManagedDataAccess.23.6.0\lib\net472\Oracle.ManagedDataAccess.dll</HintPath>
+    </Reference>
     <Reference Include="PresentationCore" />
+    <Reference Include="PresentationFramework" />
     <Reference Include="System" />
+    <Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
+    </Reference>
+    <Reference Include="System.ComponentModel.DataAnnotations" />
+    <Reference Include="System.Configuration" />
+    <Reference Include="System.Configuration.ConfigurationManager, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Configuration.ConfigurationManager.8.0.0\lib\net462\System.Configuration.ConfigurationManager.dll</HintPath>
+    </Reference>
     <Reference Include="System.Core" />
+    <Reference Include="System.Diagnostics.DiagnosticSource, Version=6.0.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Diagnostics.DiagnosticSource.6.0.1\lib\net461\System.Diagnostics.DiagnosticSource.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Formats.Asn1, Version=8.0.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Formats.Asn1.8.0.1\lib\net462\System.Formats.Asn1.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Memory, Version=4.0.1.2, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Memory.4.5.5\lib\net461\System.Memory.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Net.Http" />
+    <Reference Include="System.Numerics" />
+    <Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Runtime.Serialization" />
+    <Reference Include="System.Text.Encodings.Web, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Text.Encodings.Web.8.0.0\lib\net462\System.Text.Encodings.Web.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Text.Json, Version=8.0.0.4, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Text.Json.8.0.4\lib\net462\System.Text.Json.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
+    </Reference>
+    <Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.ValueTuple.4.5.0\lib\net47\System.ValueTuple.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Web.Extensions" />
+    <Reference Include="System.Xaml" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="Microsoft.CSharp" />
@@ -73,67 +160,133 @@
     <Reference Include="System.Drawing" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml" />
+    <Reference Include="WindowsBase" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="DevFrm\BasicData\FrmCustomer.cs">
+    <Compile Include="DevFrm\BasicData\Frm_Customer.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="DevFrm\BasicData\FrmCustomer.Designer.cs">
-      <DependentUpon>FrmCustomer.cs</DependentUpon>
+    <Compile Include="DevFrm\BasicData\Frm_Customer.Designer.cs">
+      <DependentUpon>Frm_Customer.cs</DependentUpon>
     </Compile>
-    <Compile Include="DevFrm\BasicData\FrmDepartment.cs">
+    <Compile Include="DevFrm\BasicData\Frm_Department.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="DevFrm\BasicData\FrmDepartment.Designer.cs">
-      <DependentUpon>FrmDepartment.cs</DependentUpon>
+    <Compile Include="DevFrm\BasicData\Frm_Department.Designer.cs">
+      <DependentUpon>Frm_Department.cs</DependentUpon>
     </Compile>
-    <Compile Include="DevFrm\BasicData\FrmDictionary.cs">
+    <Compile Include="DevFrm\BasicData\Frm_Holidy.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="DevFrm\BasicData\FrmDictionary.Designer.cs">
-      <DependentUpon>FrmDictionary.cs</DependentUpon>
+    <Compile Include="DevFrm\BasicData\Frm_Holidy.Designer.cs">
+      <DependentUpon>Frm_Holidy.cs</DependentUpon>
     </Compile>
-    <Compile Include="DevFrm\BasicData\FrmItemType.cs">
+    <Compile Include="DevFrm\BasicData\Frm_MesItems.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="DevFrm\BasicData\FrmItemType.Designer.cs">
-      <DependentUpon>FrmItemType.cs</DependentUpon>
+    <Compile Include="DevFrm\BasicData\Frm_MesItems.Designer.cs">
+      <DependentUpon>Frm_MesItems.cs</DependentUpon>
     </Compile>
-    <Compile Include="DevFrm\BasicData\FrmMesItems.cs">
+    <Compile Include="DevFrm\BasicData\Frm_MesItemType.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="DevFrm\BasicData\FrmMesItems.Designer.cs">
-      <DependentUpon>FrmMesItems.cs</DependentUpon>
+    <Compile Include="DevFrm\BasicData\Frm_MesItemType.Designer.cs">
+      <DependentUpon>Frm_MesItemType.cs</DependentUpon>
     </Compile>
-    <Compile Include="DevFrm\BasicData\FrmPosition.cs">
+    <Compile Include="DevFrm\BasicData\Frm_MesPosition.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="DevFrm\BasicData\FrmPosition.Designer.cs">
-      <DependentUpon>FrmPosition.cs</DependentUpon>
+    <Compile Include="DevFrm\BasicData\Frm_MesPosition.Designer.cs">
+      <DependentUpon>Frm_MesPosition.cs</DependentUpon>
     </Compile>
-    <Compile Include="DevFrm\BasicData\FrmStaff.cs">
+    <Compile Include="DevFrm\BasicData\Frm_MesWorkshop.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="DevFrm\BasicData\FrmStaff.Designer.cs">
-      <DependentUpon>FrmStaff.cs</DependentUpon>
+    <Compile Include="DevFrm\BasicData\Frm_MesWorkshop.Designer.cs">
+      <DependentUpon>Frm_MesWorkshop.cs</DependentUpon>
     </Compile>
-    <Compile Include="DevFrm\BasicData\FrmSupplier.cs">
+    <Compile Include="DevFrm\BasicData\Frm_Staff.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="DevFrm\BasicData\FrmSupplier.Designer.cs">
-      <DependentUpon>FrmSupplier.cs</DependentUpon>
+    <Compile Include="DevFrm\BasicData\Frm_Staff.Designer.cs">
+      <DependentUpon>Frm_Staff.cs</DependentUpon>
     </Compile>
+    <Compile Include="DevFrm\BasicData\Frm_Supplier.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="DevFrm\BasicData\Frm_Supplier.Designer.cs">
+      <DependentUpon>Frm_Supplier.cs</DependentUpon>
+    </Compile>
+    <Compile Include="DevFrm\BasicData\Frm_MesUnit.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="DevFrm\BasicData\Frm_MesUnit.Designer.cs">
+      <DependentUpon>Frm_MesUnit.cs</DependentUpon>
+    </Compile>
+    <Compile Include="DevFrm\QC\Frm_IQCLookups.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="DevFrm\QC\Frm_IQCLookups.Designer.cs">
+      <DependentUpon>Frm_IQCLookups.cs</DependentUpon>
+    </Compile>
+    <Compile Include="DevFrm\QC\Frm_MesQaItemsDetect01.Designer.cs">
+      <DependentUpon>Frm_MesQaItemsDetect01.cs</DependentUpon>
+    </Compile>
+    <Compile Include="DevFrm\QC\Frm_MesQaItemsDetect01.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="DevFrm\QC\Frm_MesQaItemsDetect01Check.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="DevFrm\QC\Frm_MesQaItemsDetect01Check.Designer.cs">
+      <DependentUpon>Frm_MesQaItemsDetect01Check.cs</DependentUpon>
+    </Compile>
+    <Compile Include="DevFrm\QC\Frm_MesQaMj.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="DevFrm\QC\Frm_MesQaMj.Designer.cs">
+      <DependentUpon>Frm_MesQaMj.cs</DependentUpon>
+    </Compile>
+    <Compile Include="DevFrm\QC\Frm_MesQmAql1.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="DevFrm\QC\Frm_MesQmAql1.Designer.cs">
+      <DependentUpon>Frm_MesQmAql1.cs</DependentUpon>
+    </Compile>
+    <Compile Include="DevFrm\QC\Frm_MesQmCheckitemDt.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="DevFrm\QC\Frm_MesQmCheckitemDt.Designer.cs">
+      <DependentUpon>Frm_MesQmCheckitemDt.cs</DependentUpon>
+    </Compile>
+    <Compile Include="DevFrm\QC\Frm_MesSysLookups.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="DevFrm\QC\Frm_MesSysLookups.Designer.cs">
+      <DependentUpon>Frm_MesSysLookups.cs</DependentUpon>
+    </Compile>
+    <Compile Include="DevFrm\QC\Models\MesQaItemsDetect01.cs" />
+    <Compile Include="DevFrm\QC\Models\MesQaItemsDetectDetail12.cs" />
+    <Compile Include="DevFrm\QC\Models\MesQaItemsDetectDetail5.cs" />
+    <Compile Include="DevFrm\QC\Models\MesQaMj.cs" />
+    <Compile Include="DevFrm\QC\Models\MesQmAql1.cs" />
+    <Compile Include="DevFrm\QC\Models\MesQmAql2.cs" />
+    <Compile Include="DevFrm\QC\Models\MesQmAql3.cs" />
+    <Compile Include="DevFrm\QC\Models\MesQmCheckitem.cs" />
+    <Compile Include="DevFrm\QC\Models\MesQmCheckitemDt.cs" />
+    <Compile Include="DevFrm\QC\Models\MesSysLookups.cs" />
+    <Compile Include="DevFrm\QC\Models\MesSysLookupTypes.cs" />
     <Compile Include="DevFrm\Rpt\RptPreview.cs">
       <SubType>Form</SubType>
     </Compile>
     <Compile Include="DevFrm\Rpt\RptPreview.Designer.cs">
       <DependentUpon>RptPreview.cs</DependentUpon>
     </Compile>
-    <Compile Include="DevFrm\Sys\EasyRpt.cs">
+    <Compile Include="DevFrm\Sys\EasyRptDesign.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="DevFrm\Sys\EasyRpt.Designer.cs">
-      <DependentUpon>EasyRpt.cs</DependentUpon>
+    <Compile Include="DevFrm\Sys\EasyRptDesign.Designer.cs">
+      <DependentUpon>EasyRptDesign.cs</DependentUpon>
     </Compile>
     <Compile Include="DevFrm\Sys\FileSelector.cs" />
     <Compile Include="DevFrm\FrmLogin.cs">
@@ -166,10 +319,10 @@
     <Compile Include="DevFrm\Sys\SysLog.Designer.cs">
       <DependentUpon>SysLog.cs</DependentUpon>
     </Compile>
-    <Compile Include="DevFrm\User\Organization.cs">
+    <Compile Include="DevFrm\Sys\Organization.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="DevFrm\User\Organization.Designer.cs">
+    <Compile Include="DevFrm\Sys\Organization.Designer.cs">
       <DependentUpon>Organization.cs</DependentUpon>
     </Compile>
     <Compile Include="DevFrm\User\Role.cs">
@@ -178,11 +331,17 @@
     <Compile Include="DevFrm\User\Role.Designer.cs">
       <DependentUpon>Role.cs</DependentUpon>
     </Compile>
-    <Compile Include="DevFrm\User\SysMenu.cs">
+    <Compile Include="DevFrm\Sys\SysMenu.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="DevFrm\User\SysMenu.Designer.cs">
+    <Compile Include="DevFrm\Sys\SysMenu.Designer.cs">
       <DependentUpon>SysMenu.cs</DependentUpon>
+    </Compile>
+    <Compile Include="DevFrm\User\RoleSelectAction.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="DevFrm\User\RoleSelectAction.Designer.cs">
+      <DependentUpon>RoleSelectAction.cs</DependentUpon>
     </Compile>
     <Compile Include="DevFrm\User\User.cs">
       <SubType>Form</SubType>
@@ -202,15 +361,58 @@
     <Compile Include="DevFrm\User\UserSetPwd.Designer.cs">
       <DependentUpon>UserSetPwd.cs</DependentUpon>
     </Compile>
+    <Compile Include="DevFrm\Warehouse\Frm_ArrivalBarcode.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="DevFrm\Warehouse\Frm_ArrivalBarcode.Designer.cs">
+      <DependentUpon>Frm_ArrivalBarcode.cs</DependentUpon>
+    </Compile>
+    <Compile Include="DevFrm\Warehouse\Frm_MesDepot.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="DevFrm\Warehouse\Frm_MesDepot.Designer.cs">
+      <DependentUpon>Frm_MesDepot.cs</DependentUpon>
+    </Compile>
+    <Compile Include="DevFrm\Warehouse\Frm_MesInvItemArn.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="DevFrm\Warehouse\Frm_MesInvItemArn.Designer.cs">
+      <DependentUpon>Frm_MesInvItemArn.cs</DependentUpon>
+    </Compile>
+    <Compile Include="DevFrm\Warehouse\Frm_InitialBarcode.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="DevFrm\Warehouse\Frm_InitialBarcode.Designer.cs">
+      <DependentUpon>Frm_InitialBarcode.cs</DependentUpon>
+    </Compile>
+    <Compile Include="DevFrm\Warehouse\Frm_MesRohIn.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="DevFrm\Warehouse\Frm_MesRohIn.Designer.cs">
+      <DependentUpon>Frm_MesRohIn.cs</DependentUpon>
+    </Compile>
+    <Compile Include="DevFrm\Warehouse\Models\MesDepots.cs" />
+    <Compile Include="DevFrm\Warehouse\Models\MesDepotSections.cs" />
+    <Compile Include="DevFrm\Warehouse\Models\MesInvItemArn.cs" />
+    <Compile Include="DevFrm\Warehouse\Models\MesInvItemArnDetail.cs" />
+    <Compile Include="DevFrm\Warehouse\Models\MesInvItemBarcodes.cs" />
+    <Compile Include="DevFrm\Warehouse\Models\MesInvItemInCDetails.cs" />
+    <Compile Include="DevFrm\Warehouse\Models\MesInvItemStocks.cs" />
+    <Compile Include="DevFrm\Warehouse\Models\MesItems.cs" />
+    <Compile Include="DevFrm\Warehouse\Models\VArrivalBarcode.cs" />
+    <Compile Include="DevFrm\Warehouse\Models\VArrivalBarcodeItem.cs" />
+    <Compile Include="DevFrm\Warehouse\Models\VArrivalBarcodeItem3.cs" />
     <Compile Include="Entity\LoginInfoModel.cs" />
-    <Compile Include="Entity\MesItems.cs" />
     <Compile Include="Entity\PageQueryModel.cs" />
     <Compile Include="Entity\ReturnModel.cs" />
+    <Compile Include="Entity\XlsOutModel.cs" />
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Properties\Resources1.Designer.cs" />
-    <Compile Include="Query\MesItemQuery.cs" />
-    <Compile Include="Service\MesItemServices.cs" />
+    <Compile Include="Properties\Resources.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
     <Compile Include="TestForm\XtraForm1.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -221,11 +423,65 @@
     <Compile Include="ToolBox\MsgHelper.cs" />
     <Compile Include="ToolBox\UpdateParentEventArgs.cs" />
     <Compile Include="ToolBox\UtilityHelper.cs" />
-    <Compile Include="UserControl\PageBar.cs">
+    <Compile Include="UserControl\SelectCgMx.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="UserControl\SelectCgMx.Designer.cs">
+      <DependentUpon>SelectCgMx.cs</DependentUpon>
+    </Compile>
+    <Compile Include="UserControl\SelectCheckDt.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="UserControl\SelectCheckDt.Designer.cs">
+      <DependentUpon>SelectCheckDt.cs</DependentUpon>
+    </Compile>
+    <Compile Include="UserControl\ShowLogcs.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="UserControl\ShowLogcs.Designer.cs">
+      <DependentUpon>ShowLogcs.cs</DependentUpon>
+    </Compile>
+    <Compile Include="UserControl\ShowRptWizard.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="UserControl\ShowRptWizard.Designer.cs">
+      <DependentUpon>ShowRptWizard.cs</DependentUpon>
+    </Compile>
+    <Compile Include="UserControl\UcComBox.cs">
       <SubType>UserControl</SubType>
     </Compile>
-    <Compile Include="UserControl\PageBar.Designer.cs">
-      <DependentUpon>PageBar.cs</DependentUpon>
+    <Compile Include="UserControl\UcComBox.Designer.cs">
+      <DependentUpon>UcComBox.cs</DependentUpon>
+    </Compile>
+    <Compile Include="UserControl\UcLoading.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="UserControl\UcLoading.Designer.cs">
+      <DependentUpon>UcLoading.cs</DependentUpon>
+    </Compile>
+    <Compile Include="UserControl\UcLookCk.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="UserControl\UcLookCk.Designer.cs">
+      <DependentUpon>UcLookCk.cs</DependentUpon>
+    </Compile>
+    <Compile Include="UserControl\UcLookItems.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="UserControl\UcLookItems.Designer.cs">
+      <DependentUpon>UcLookItems.cs</DependentUpon>
+    </Compile>
+    <Compile Include="UserControl\UcLookSupplier.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="UserControl\UcLookSupplier.Designer.cs">
+      <DependentUpon>UcLookSupplier.cs</DependentUpon>
+    </Compile>
+    <Compile Include="UserControl\UcPageBar.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="UserControl\UcPageBar.Designer.cs">
+      <DependentUpon>UcPageBar.cs</DependentUpon>
     </Compile>
     <Compile Include="UserControl\ShowDialogForm.cs">
       <SubType>Form</SubType>
@@ -239,35 +495,74 @@
     <Compile Include="UserControl\ShowFilter.Designer.cs">
       <DependentUpon>ShowFilter.cs</DependentUpon>
     </Compile>
-    <Compile Include="UserControl\ToolBarMenu.cs">
+    <Compile Include="UserControl\UcToolBarMenu.cs">
       <SubType>UserControl</SubType>
     </Compile>
-    <Compile Include="UserControl\ToolBarMenu.Designer.cs">
-      <DependentUpon>ToolBarMenu.cs</DependentUpon>
+    <Compile Include="UserControl\UcToolBarMenu.Designer.cs">
+      <DependentUpon>UcToolBarMenu.cs</DependentUpon>
     </Compile>
-    <EmbeddedResource Include="DevFrm\BasicData\FrmCustomer.resx">
-      <DependentUpon>FrmCustomer.cs</DependentUpon>
+    <Compile Include="UserControl\XtraUserControl1.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="UserControl\XtraUserControl1.Designer.cs">
+      <DependentUpon>XtraUserControl1.cs</DependentUpon>
+    </Compile>
+    <EmbeddedResource Include="DevFrm\BasicData\Frm_Customer.resx">
+      <DependentUpon>Frm_Customer.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="DevFrm\BasicData\FrmDepartment.resx">
-      <DependentUpon>FrmDepartment.cs</DependentUpon>
+    <EmbeddedResource Include="DevFrm\BasicData\Frm_Department.resx">
+      <DependentUpon>Frm_Department.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="DevFrm\BasicData\FrmItemType.resx">
-      <DependentUpon>FrmItemType.cs</DependentUpon>
+    <EmbeddedResource Include="DevFrm\BasicData\Frm_Holidy.resx">
+      <DependentUpon>Frm_Holidy.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="DevFrm\BasicData\FrmMesItems.resx">
-      <DependentUpon>FrmMesItems.cs</DependentUpon>
+    <EmbeddedResource Include="DevFrm\BasicData\Frm_MesItems.resx">
+      <DependentUpon>Frm_MesItems.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="DevFrm\BasicData\FrmPosition.resx">
-      <DependentUpon>FrmPosition.cs</DependentUpon>
+    <EmbeddedResource Include="DevFrm\BasicData\Frm_MesItemType.resx">
+      <DependentUpon>Frm_MesItemType.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="DevFrm\BasicData\FrmSupplier.resx">
-      <DependentUpon>FrmSupplier.cs</DependentUpon>
+    <EmbeddedResource Include="DevFrm\BasicData\Frm_MesPosition.resx">
+      <DependentUpon>Frm_MesPosition.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="DevFrm\BasicData\Frm_MesWorkshop.resx">
+      <DependentUpon>Frm_MesWorkshop.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="DevFrm\BasicData\Frm_Staff.resx">
+      <DependentUpon>Frm_Staff.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="DevFrm\BasicData\Frm_Supplier.resx">
+      <DependentUpon>Frm_Supplier.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="DevFrm\BasicData\Frm_MesUnit.resx">
+      <DependentUpon>Frm_MesUnit.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="DevFrm\FrmLogin.resx">
       <DependentUpon>FrmLogin.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="DevFrm\FrmMain.resx">
       <DependentUpon>FrmMain.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="DevFrm\QC\Frm_IQCLookups.resx">
+      <DependentUpon>Frm_IQCLookups.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="DevFrm\QC\Frm_MesQaItemsDetect01.resx">
+      <DependentUpon>Frm_MesQaItemsDetect01.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="DevFrm\QC\Frm_MesQaItemsDetect01Check.resx">
+      <DependentUpon>Frm_MesQaItemsDetect01Check.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="DevFrm\QC\Frm_MesQaMj.resx">
+      <DependentUpon>Frm_MesQaMj.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="DevFrm\QC\Frm_MesQmAql1.resx">
+      <DependentUpon>Frm_MesQmAql1.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="DevFrm\QC\Frm_MesQmCheckitemDt.resx">
+      <DependentUpon>Frm_MesQmCheckitemDt.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="DevFrm\QC\Frm_MesSysLookups.resx">
+      <DependentUpon>Frm_MesSysLookups.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="DevFrm\Rpt\RptPreview.resx">
       <DependentUpon>RptPreview.cs</DependentUpon>
@@ -278,20 +573,24 @@
     <EmbeddedResource Include="DevFrm\Sys\EasyCode.resx">
       <DependentUpon>EasyCode.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="DevFrm\Sys\EasyRpt.resx">
-      <DependentUpon>EasyRpt.cs</DependentUpon>
+    <EmbeddedResource Include="DevFrm\Sys\EasyRptDesign.resx">
+      <DependentUpon>EasyRptDesign.cs</DependentUpon>
+      <SubType>Designer</SubType>
     </EmbeddedResource>
     <EmbeddedResource Include="DevFrm\Sys\SysLog.resx">
       <DependentUpon>SysLog.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="DevFrm\User\Organization.resx">
+    <EmbeddedResource Include="DevFrm\Sys\Organization.resx">
       <DependentUpon>Organization.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="DevFrm\User\Role.resx">
       <DependentUpon>Role.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="DevFrm\User\SysMenu.resx">
+    <EmbeddedResource Include="DevFrm\Sys\SysMenu.resx">
       <DependentUpon>SysMenu.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="DevFrm\User\RoleSelectAction.resx">
+      <DependentUpon>RoleSelectAction.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="DevFrm\User\User.resx">
       <DependentUpon>User.cs</DependentUpon>
@@ -302,12 +601,59 @@
     <EmbeddedResource Include="DevFrm\User\UserSetPwd.resx">
       <DependentUpon>UserSetPwd.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Properties\Resources.resx" />
+    <EmbeddedResource Include="DevFrm\Warehouse\Frm_ArrivalBarcode.resx">
+      <DependentUpon>Frm_ArrivalBarcode.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="DevFrm\Warehouse\Frm_MesDepot.resx">
+      <DependentUpon>Frm_MesDepot.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="DevFrm\Warehouse\Frm_MesInvItemArn.resx">
+      <DependentUpon>Frm_MesInvItemArn.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="DevFrm\Warehouse\Frm_InitialBarcode.resx">
+      <DependentUpon>Frm_InitialBarcode.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="DevFrm\Warehouse\Frm_MesRohIn.resx">
+      <DependentUpon>Frm_MesRohIn.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Properties\licenses.licx" />
+    <EmbeddedResource Include="Properties\Resources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <SubType>Designer</SubType>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
     <EmbeddedResource Include="TestForm\XtraForm1.resx">
       <DependentUpon>XtraForm1.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="UserControl\PageBar.resx">
-      <DependentUpon>PageBar.cs</DependentUpon>
+    <EmbeddedResource Include="UserControl\SelectCgMx.resx">
+      <DependentUpon>SelectCgMx.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="UserControl\SelectCheckDt.resx">
+      <DependentUpon>SelectCheckDt.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="UserControl\ShowLogcs.resx">
+      <DependentUpon>ShowLogcs.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="UserControl\ShowRptWizard.resx">
+      <DependentUpon>ShowRptWizard.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="UserControl\UcComBox.resx">
+      <DependentUpon>UcComBox.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="UserControl\UcLoading.resx">
+      <DependentUpon>UcLoading.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="UserControl\UcLookCk.resx">
+      <DependentUpon>UcLookCk.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="UserControl\UcLookItems.resx">
+      <DependentUpon>UcLookItems.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="UserControl\UcLookSupplier.resx">
+      <DependentUpon>UcLookSupplier.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="UserControl\UcPageBar.resx">
+      <DependentUpon>UcPageBar.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="UserControl\ShowDialogForm.resx">
       <DependentUpon>ShowDialogForm.cs</DependentUpon>
@@ -315,8 +661,11 @@
     <EmbeddedResource Include="UserControl\ShowFilter.resx">
       <DependentUpon>ShowFilter.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="UserControl\ToolBarMenu.resx">
-      <DependentUpon>ToolBarMenu.cs</DependentUpon>
+    <EmbeddedResource Include="UserControl\UcToolBarMenu.resx">
+      <DependentUpon>UcToolBarMenu.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="UserControl\XtraUserControl1.resx">
+      <DependentUpon>XtraUserControl1.cs</DependentUpon>
     </EmbeddedResource>
     <None Include="App.config" />
     <None Include="packages.config" />
@@ -331,6 +680,13 @@
     </Compile>
   </ItemGroup>
   <ItemGroup>
+    <Content Include="logo_ico.ico" />
+    <None Include="Resources\wraptext2_16x16.png" />
+    <None Include="Resources\wraptext2_32x32.png" />
+    <None Include="Resources\viewmergeddata_16x16.png" />
+    <None Include="Resources\viewmergeddata_32x32.png" />
+    <None Include="Resources\zoom100_16x16.png" />
+    <None Include="Resources\zoom100_32x32.png" />
     <None Include="Resources\user_16x161.png" />
     <None Include="Resources\trackingchanges_allmarkup_32x32.png" />
     <None Include="Resources\trackingchanges_allmarkup_16x16.png" />
@@ -366,9 +722,6 @@
     <None Include="Resources\doubleprev_16x16.png" />
     <None Include="Resources\doublenext_16x16.png" />
     <None Include="Resources\last_16x16.png" />
-    <None Include="Resources\login_bg2.png" />
-    <None Include="Resources\login_bg1.png" />
-    <None Include="Resources\login_bg222.png" />
     <None Include="Resources\login_bg6.png" />
     <None Include="Resources\publicfix_32x32.png" />
     <None Include="Resources\groupbyresource_32x32.png" />
@@ -392,7 +745,6 @@
     <None Include="Resources\formatnumbertime_16x16.png" />
     <None Include="Resources\find_32x32.png" />
     <None Include="Resources\find_16x16.png" />
-    <None Include="Resources\enablesearch.svg" />
     <None Include="Resources\employee_32x32.png" />
     <None Include="Resources\boposition2_16x16.png" />
     <None Include="Resources\newitem_16x16.png" />
@@ -400,17 +752,81 @@
     <None Include="Resources\bodepartment_16x161.png" />
     <None Include="Resources\engineering_16x16.png" />
     <None Include="Resources\cleartablestyle_16x16.png" />
+    <None Include="Resources\logo_png.png" />
+    <None Include="Resources\logo_png_black.png" />
+    <None Include="Resources\group2_32x32.png" />
+    <None Include="Resources\group_32x32.png" />
+    <None Include="Resources\alignmiddlecenter_32x32.png" />
+    <None Include="Resources\formatnumbergeneral_16x16.png" />
+    <None Include="Resources\sortasc_16x16.png" />
+    <None Include="Resources\checkbuttons_32x32.png" />
+    <None Include="Resources\checkbuttons_16x16.png" />
+    <None Include="Resources\radiobuttons_32x32.png" />
+    <None Include="Resources\radiobuttons_16x16.png" />
+    <None Include="Resources\lookup&amp;reference_16x16.png" />
+    <None Include="Resources\task_16x16.png" />
+    <None Include="Resources\checkbuttons_16x161.png" />
+    <None Include="Resources\boposition2_32x32.png" />
+    <None Include="Resources\boposition2_16x161.png" />
+    <None Include="Resources\ide_16x16.png" />
+    <None Include="Resources\spellcheck_16x16.png" />
+    <None Include="Resources\clearformatting_16x16.png" />
+    <None Include="Resources\sortandfilter_16x16.png" />
+    <None Include="Resources\deletetablecells_32x32.png" />
+    <None Include="Resources\deletetablecells_16x16.png" />
+    <None Include="Resources\checkbox2_32x322.png" />
+    <None Include="Resources\checkbox2_16x161.png" />
+    <None Include="Resources\forcetesting_32x321.png" />
+    <None Include="Resources\forcetesting_16x161.png" />
+    <None Include="Resources\trackingchanges_showmarkup_32x32.png" />
+    <None Include="Resources\trackingchanges_showmarkup_16x16.png" />
+    <None Include="Resources\insertdatafield_32x32.png" />
+    <None Include="Resources\insertdatafield_16x16.png" />
+    <None Include="Resources\sortbyorderdate_32x32.png" />
+    <None Include="Resources\sortbyorderdate_16x16.png" />
+    <None Include="Resources\sortbyinvoice_32x32.png" />
+    <None Include="Resources\sortbyinvoice_16x16.png" />
+    <None Include="Resources\checkbuttons_32x321.png" />
+    <None Include="Resources\checkbuttons_16x162.png" />
+    <None Include="Resources\converttorange_32x321.png" />
+    <None Include="Resources\converttorange_16x161.png" />
+    <None Include="Resources\trackingchanges_next_32x32.png" />
+    <None Include="Resources\trackingchanges_next_16x16.png" />
+    <None Include="Resources\sendxls_32x32.png" />
+    <None Include="Resources\sendxls_16x16.png" />
+    <None Include="Resources\fill_32x32.png" />
+    <None Include="Resources\fill_16x16.png" />
+    <None Include="Resources\bouser_16x162.png" />
+    <None Include="Resources\refresh_32x32.png" />
+    <None Include="Resources\refresh_32x321.png" />
     <Content Include="Resources\user_16x16.png" />
   </ItemGroup>
+  <ItemGroup />
   <ItemGroup>
-    <Folder Include="DevFrm\Warehouse\" />
+    <BootstrapperPackage Include=".NETFramework,Version=v4.8">
+      <Visible>False</Visible>
+      <ProductName>Microsoft .NET Framework 4.8 %28x86 鍜� x64%29</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="..\packages\Microsoft.Web.WebView2.1.0.2592.51\build\Microsoft.Web.WebView2.targets" Condition="Exists('..\packages\Microsoft.Web.WebView2.1.0.2592.51\build\Microsoft.Web.WebView2.targets')" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>杩欏彴璁$畻鏈轰笂缂哄皯姝ら」鐩紩鐢ㄧ殑 NuGet 绋嬪簭鍖呫�備娇鐢ㄢ�淣uGet 绋嬪簭鍖呰繕鍘熲�濆彲涓嬭浇杩欎簺绋嬪簭鍖呫�傛湁鍏虫洿澶氫俊鎭紝璇峰弬瑙� http://go.microsoft.com/fwlink/?LinkID=322105銆傜己灏戠殑鏂囦欢鏄� {0}銆�</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\packages\Microsoft.Web.WebView2.1.0.2592.51\build\Microsoft.Web.WebView2.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Web.WebView2.1.0.2592.51\build\Microsoft.Web.WebView2.targets'))" />
+  </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
+         Other similar extension points exist, see Microsoft.Common.targets.
+    <Target Name="BeforeBuild">
+    </Target>
+    <Target Name="AfterBuild">
+    </Target>
+    -->
 </Project>
\ No newline at end of file

--
Gitblit v1.9.3