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 | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 54 insertions(+), 0 deletions(-)
diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index 146c036..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>
@@ -355,6 +361,12 @@
<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>
@@ -367,6 +379,12 @@
<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>
@@ -377,6 +395,13 @@
<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\PageQueryModel.cs" />
<Compile Include="Entity\ReturnModel.cs" />
@@ -564,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>
@@ -573,11 +601,17 @@
<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>
</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>
@@ -647,6 +681,10 @@
</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" />
@@ -747,6 +785,22 @@
<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" />
<Content Include="Resources\user_16x16.png" />
</ItemGroup>
<ItemGroup />
--
Gitblit v1.9.3