From e4662c9a134dfb7204016073060eaf3efd59abea Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期六, 02 十一月 2024 16:43:53 +0800
Subject: [PATCH] Merge branch 'master' of http://43.142.96.171:8080/r/~tjx/GsMesClient
---
DevApp/Gs.DevApp/Gs.DevApp.csproj | 24 ++++++++++++++++++++++++
1 files changed, 24 insertions(+), 0 deletions(-)
diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index 11ecd6e..4ae2332 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -337,6 +337,12 @@
<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>
</Compile>
@@ -354,6 +360,12 @@
</Compile>
<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>
@@ -384,8 +396,12 @@
<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\PageQueryModel.cs" />
<Compile Include="Entity\ReturnModel.cs" />
@@ -573,6 +589,9 @@
<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>
</EmbeddedResource>
@@ -581,6 +600,9 @@
</EmbeddedResource>
<EmbeddedResource Include="DevFrm\User\UserSetPwd.resx">
<DependentUpon>UserSetPwd.cs</DependentUpon>
+ </EmbeddedResource>
+ <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>
@@ -777,6 +799,8 @@
<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" />
<Content Include="Resources\user_16x16.png" />
</ItemGroup>
<ItemGroup />
--
Gitblit v1.9.3