From 0137d44c9e5b1dd76b208644a1b1484da0a1a1ab Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期二, 22 十月 2024 12:17:46 +0800
Subject: [PATCH] t
---
DevApp/Gs.DevApp/Gs.DevApp.csproj | 288 +++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 196 insertions(+), 92 deletions(-)
diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index 50a8cea..b49eb25 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -28,6 +28,7 @@
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
<UseApplicationTrust>false</UseApplicationTrust>
<BootstrapperEnabled>true</BootstrapperEnabled>
+ <TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
@@ -37,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>
@@ -58,32 +59,39 @@
<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.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="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>
@@ -97,16 +105,51 @@
<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" />
@@ -120,53 +163,65 @@
<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\Rpt\RptPreview.cs">
<SubType>Form</SubType>
@@ -174,11 +229,11 @@
<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">
@@ -211,10 +266,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">
@@ -223,10 +278,10 @@
<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\User.cs">
@@ -247,10 +302,24 @@
<Compile Include="DevFrm\User\UserSetPwd.Designer.cs">
<DependentUpon>UserSetPwd.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_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="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\Resources.Designer.cs">
@@ -258,8 +327,6 @@
<DesignTime>True</DesignTime>
<DependentUpon>Resources.resx</DependentUpon>
</Compile>
- <Compile Include="Query\MesItemQuery.cs" />
- <Compile Include="Service\MesItemServices.cs" />
<Compile Include="TestForm\XtraForm1.cs">
<SubType>Form</SubType>
</Compile>
@@ -270,11 +337,23 @@
<Compile Include="ToolBox\MsgHelper.cs" />
<Compile Include="ToolBox\UpdateParentEventArgs.cs" />
<Compile Include="ToolBox\UtilityHelper.cs" />
- <Compile Include="UserControl\PageBar.cs">
+ <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\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>
@@ -288,29 +367,41 @@
<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>
+ <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>
@@ -327,19 +418,20 @@
<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\User.resx">
@@ -351,6 +443,13 @@
<EmbeddedResource Include="DevFrm\User\UserSetPwd.resx">
<DependentUpon>UserSetPwd.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\Warehouse\Frm_MesDepot.resx">
+ <DependentUpon>Frm_MesDepot.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>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
@@ -359,8 +458,14 @@
<EmbeddedResource Include="TestForm\XtraForm1.resx">
<DependentUpon>XtraForm1.cs</DependentUpon>
</EmbeddedResource>
- <EmbeddedResource Include="UserControl\PageBar.resx">
- <DependentUpon>PageBar.cs</DependentUpon>
+ <EmbeddedResource Include="UserControl\ShowRptWizard.resx">
+ <DependentUpon>ShowRptWizard.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="UserControl\UcComBox.resx">
+ <DependentUpon>UcComBox.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="UserControl\UcPageBar.resx">
+ <DependentUpon>UcPageBar.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="UserControl\ShowDialogForm.resx">
<DependentUpon>ShowDialogForm.cs</DependentUpon>
@@ -368,8 +473,8 @@
<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>
<None Include="App.config" />
<None Include="packages.config" />
@@ -422,9 +527,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" />
@@ -448,7 +550,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" />
@@ -458,11 +559,14 @@
<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" />
<Content Include="Resources\user_16x16.png" />
</ItemGroup>
- <ItemGroup>
- <Folder Include="DevFrm\Warehouse\" />
- </ItemGroup>
+ <ItemGroup />
<ItemGroup>
<BootstrapperPackage Include=".NETFramework,Version=v4.8">
<Visible>False</Visible>
--
Gitblit v1.9.3