From c115ac388af5a6928716f0146a75a2a42fb27d8e Mon Sep 17 00:00:00 2001
From: lg <999544862qq.com>
Date: 星期日, 22 九月 2024 20:52:16 +0800
Subject: [PATCH] 仓库管理
---
DevApp/Gs.DevApp/Gs.DevApp.csproj | 50 +++++++++++++++++++++++++++++++++++++-------------
1 files changed, 37 insertions(+), 13 deletions(-)
diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index a5ba081..09d6ab5 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -51,6 +51,9 @@
<PropertyGroup>
<ApplicationIcon>logo_ico.ico</ApplicationIcon>
</PropertyGroup>
+ <PropertyGroup>
+ <NoWin32Manifest>true</NoWin32Manifest>
+ </PropertyGroup>
<ItemGroup>
<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>
@@ -102,7 +105,9 @@
<HintPath>..\packages\System.Configuration.ConfigurationManager.8.0.0\lib\net462\System.Configuration.ConfigurationManager.dll</HintPath>
</Reference>
<Reference Include="System.Core" />
+ <Reference Include="System.Net.Http" />
<Reference Include="System.Runtime.Serialization" />
+ <Reference Include="System.Web.Extensions" />
<Reference Include="System.Xaml" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
@@ -132,6 +137,12 @@
</Compile>
<Compile Include="DevFrm\BasicData\FrmDictionary.Designer.cs">
<DependentUpon>FrmDictionary.cs</DependentUpon>
+ </Compile>
+ <Compile Include="DevFrm\BasicData\FrmHolidy.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\BasicData\FrmHolidy.Designer.cs">
+ <DependentUpon>FrmHolidy.cs</DependentUpon>
</Compile>
<Compile Include="DevFrm\BasicData\FrmItemType.cs">
<SubType>Form</SubType>
@@ -206,10 +217,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">
@@ -218,10 +229,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">
@@ -241,6 +252,12 @@
</Compile>
<Compile Include="DevFrm\User\UserSetPwd.Designer.cs">
<DependentUpon>UserSetPwd.cs</DependentUpon>
+ </Compile>
+ <Compile Include="DevFrm\Warehouse\FrmDepot.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\Warehouse\FrmDepot.Designer.cs">
+ <DependentUpon>FrmDepot.cs</DependentUpon>
</Compile>
<Compile Include="Entity\LoginInfoModel.cs" />
<Compile Include="Entity\MesItems.cs" />
@@ -295,6 +312,9 @@
<EmbeddedResource Include="DevFrm\BasicData\FrmDepartment.resx">
<DependentUpon>FrmDepartment.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\BasicData\FrmHolidy.resx">
+ <DependentUpon>FrmHolidy.cs</DependentUpon>
+ </EmbeddedResource>
<EmbeddedResource Include="DevFrm\BasicData\FrmItemType.resx">
<DependentUpon>FrmItemType.cs</DependentUpon>
</EmbeddedResource>
@@ -328,13 +348,13 @@
<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">
@@ -346,9 +366,16 @@
<EmbeddedResource Include="DevFrm\User\UserSetPwd.resx">
<DependentUpon>UserSetPwd.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\Warehouse\FrmDepot.resx">
+ <DependentUpon>FrmDepot.cs</DependentUpon>
+ </EmbeddedResource>
<EmbeddedResource Include="Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
+ <SubType>Designer</SubType>
+ </EmbeddedResource>
+ <EmbeddedResource Include="TestForm\XtraForm1.resx">
+ <DependentUpon>XtraForm1.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="UserControl\PageBar.resx">
<DependentUpon>PageBar.cs</DependentUpon>
@@ -376,6 +403,8 @@
</ItemGroup>
<ItemGroup>
<Content Include="logo_ico.ico" />
+ <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" />
@@ -411,9 +440,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" />
@@ -437,7 +463,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" />
@@ -446,11 +471,10 @@
<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" />
<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