Merge remote-tracking branch 'origin/master'

啊鑫

2024-11-22 a985c4d4b80fbf3eb4abbe385adcd0536fd29eda

 DevApp/Gs.DevApp/Gs.DevApp.csproj

@@ -397,6 +397,18 @@
    <Compile Include="DevFrm\Warehouse\Frm_InitialBarcode.Designer.cs">
      <DependentUpon>Frm_InitialBarcode.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\Warehouse\Frm_MesInvItemIns.cs">
      <SubType>Form</SubType>
    </Compile>
    <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>
@@ -409,11 +421,38 @@
    <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" />
    <Compile Include="DevFrm\Warehouse\Models\VArrivalBarcodeItem.cs" />
    <Compile Include="DevFrm\Warehouse\Models\VArrivalBarcodeItem3.cs" />
    <Compile Include="DevFrm\WOM\Frm_Womcaa.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Include="DevFrm\WOM\Frm_Womcaa.Designer.cs">
      <DependentUpon>Frm_Womcaa.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\WOM\Frm_Womdaa.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Include="DevFrm\WOM\Frm_Womdaa.Designer.cs">
      <DependentUpon>Frm_Womdaa.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\WOM\Frm_Wompaa.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Include="DevFrm\WOM\Frm_Wompaa.Designer.cs">
      <DependentUpon>Frm_Wompaa.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\WOM\Frm_Wompba.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Include="DevFrm\WOM\Frm_Wompba.Designer.cs">
      <DependentUpon>Frm_Wompba.cs</DependentUpon>
    </Compile>
    <Compile Include="Entity\LoginInfoModel.cs" />
    <Compile Include="Entity\PageQueryModel.cs" />
    <Compile Include="Entity\ReturnModel.cs" />
@@ -437,12 +476,6 @@
    <Compile Include="TestForm\XtraForm2.Designer.cs">
      <DependentUpon>XtraForm2.cs</DependentUpon>
    </Compile>
    <Compile Include="TestForm\XtraForm3.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Include="TestForm\XtraForm3.Designer.cs">
      <DependentUpon>XtraForm3.cs</DependentUpon>
    </Compile>
    <Compile Include="ToolBox\LogHelper.cs" />
    <Compile Include="ToolBox\MsgHelper.cs" />
    <Compile Include="ToolBox\UpdateParentEventArgs.cs" />
@@ -452,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>
@@ -536,12 +575,6 @@
    </Compile>
    <Compile Include="UserControl\UCUpFile.Designer.cs">
      <DependentUpon>UCUpFile.cs</DependentUpon>
    </Compile>
    <Compile Include="UserControl\XtraUserControl1.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Include="UserControl\XtraUserControl1.Designer.cs">
      <DependentUpon>XtraUserControl1.cs</DependentUpon>
    </Compile>
    <EmbeddedResource Include="DevFrm\BasicData\Frm_Customer.resx">
      <DependentUpon>Frm_Customer.cs</DependentUpon>
@@ -649,8 +682,26 @@
    <EmbeddedResource Include="DevFrm\Warehouse\Frm_InitialBarcode.resx">
      <DependentUpon>Frm_InitialBarcode.cs</DependentUpon>
    </EmbeddedResource>
    <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>
    <EmbeddedResource Include="DevFrm\WOM\Frm_Womcaa.resx">
      <DependentUpon>Frm_Womcaa.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\WOM\Frm_Womdaa.resx">
      <DependentUpon>Frm_Womdaa.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\WOM\Frm_Wompaa.resx">
      <DependentUpon>Frm_Wompaa.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\WOM\Frm_Wompba.resx">
      <DependentUpon>Frm_Wompba.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="Properties\licenses.licx" />
    <EmbeddedResource Include="Properties\Resources.resx">
@@ -664,11 +715,11 @@
    <EmbeddedResource Include="TestForm\XtraForm2.resx">
      <DependentUpon>XtraForm2.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="TestForm\XtraForm3.resx">
      <DependentUpon>XtraForm3.cs</DependentUpon>
    </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>
@@ -712,9 +763,6 @@
    <EmbeddedResource Include="UserControl\UCUpFile.resx">
      <DependentUpon>UCUpFile.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="UserControl\XtraUserControl1.resx">
      <DependentUpon>XtraUserControl1.cs</DependentUpon>
    </EmbeddedResource>
    <None Include="App.config" />
    <None Include="packages.config" />
    <None Include="Properties\Settings.settings">
@@ -729,6 +777,7 @@
  </ItemGroup>
  <ItemGroup>
    <Content Include="logo_ico.ico" />
    <None Include="Resources\wordwrap_32x32.png" />
    <None Include="Resources\wraptext2_16x16.png" />
    <None Include="Resources\wraptext2_32x32.png" />
    <None Include="Resources\viewmergeddata_16x16.png" />
@@ -852,6 +901,18 @@
    <None Include="Resources\updatetableofcontents_32x32.png" />
    <None Include="Resources\updatetableofcontents_16x16.png" />
    <None Include="Resources\close_16x16.png" />
    <None Include="Resources\print_16x16.png" />
    <None Include="Resources\printlayoutview_32x32.png" />
    <None Include="Resources\printlayoutview_16x16.png" />
    <None Include="Resources\download_16x16.png" />
    <None Include="Resources\download_16x161.png" />
    <None Include="Resources\ico_check.png" />
    <None Include="Resources\ico_noCheck.png" />
    <None Include="Resources\copymodeldifferences_32x32.png" />
    <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 />