Merge branch 'master' of http://43.142.96.171:8080/r/~tjx/GsMesClient

lu

2024-11-02 e4662c9a134dfb7204016073060eaf3efd59abea

 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 />