Merge remote-tracking branch 'origin/master'

啊鑫

2024-11-22 a985c4d4b80fbf3eb4abbe385adcd0536fd29eda

 DevApp/Gs.DevApp/Gs.DevApp.csproj

@@ -403,6 +403,12 @@
    <Compile Include="DevFrm\Warehouse\Frm_MesInvItemIns.Designer.cs">
      <DependentUpon>Frm_MesInvItemIns.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\Warehouse\Frm_MesInvItemOuts.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Include="DevFrm\Warehouse\Frm_MesInvItemOuts.Designer.cs">
      <DependentUpon>Frm_MesInvItemOuts.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\Warehouse\Frm_MesRohIn.cs">
      <SubType>Form</SubType>
    </Compile>
@@ -415,6 +421,9 @@
    <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\MesInvItemOutCDetails.cs" />
    <Compile Include="DevFrm\Warehouse\Models\MesInvItemOutItems.cs" />
    <Compile Include="DevFrm\Warehouse\Models\MesInvItemOuts.cs" />
    <Compile Include="DevFrm\Warehouse\Models\MesInvItemStocks.cs" />
    <Compile Include="DevFrm\Warehouse\Models\MesItems.cs" />
    <Compile Include="DevFrm\Warehouse\Models\VArrivalBarcode.cs" />
@@ -476,6 +485,12 @@
    </Compile>
    <Compile Include="UserControl\SelectCgMx.Designer.cs">
      <DependentUpon>SelectCgMx.cs</DependentUpon>
    </Compile>
    <Compile Include="UserControl\SelectCgOutMx.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Include="UserControl\SelectCgOutMx.Designer.cs">
      <DependentUpon>SelectCgOutMx.cs</DependentUpon>
    </Compile>
    <Compile Include="UserControl\SelectCheckDt.cs">
      <SubType>Form</SubType>
@@ -670,6 +685,9 @@
    <EmbeddedResource Include="DevFrm\Warehouse\Frm_MesInvItemIns.resx">
      <DependentUpon>Frm_MesInvItemIns.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\Warehouse\Frm_MesInvItemOuts.resx">
      <DependentUpon>Frm_MesInvItemOuts.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\Warehouse\Frm_MesRohIn.resx">
      <DependentUpon>Frm_MesRohIn.cs</DependentUpon>
    </EmbeddedResource>
@@ -699,6 +717,9 @@
    </EmbeddedResource>
    <EmbeddedResource Include="UserControl\SelectCgMx.resx">
      <DependentUpon>SelectCgMx.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="UserControl\SelectCgOutMx.resx">
      <DependentUpon>SelectCgOutMx.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="UserControl\SelectCheckDt.resx">
      <DependentUpon>SelectCheckDt.cs</DependentUpon>
@@ -891,6 +912,7 @@
    <None Include="Resources\add_32x32.png" />
    <None Include="Resources\changedatasourcepivottable_32x32.png" />
    <None Include="Resources\showworktimeonly_32x32.png" />
    <None Include="Resources\open2.svg" />
    <Content Include="Resources\user_16x16.png" />
  </ItemGroup>
  <ItemGroup />