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

lu

2024-10-25 ce8e6ea5d262001b2b4bd711a85e18d8e0071003

 DevApp/Gs.DevApp/Gs.DevApp.csproj

@@ -223,6 +223,28 @@
    <Compile Include="DevFrm\BasicData\Frm_MesUnit.Designer.cs">
      <DependentUpon>Frm_MesUnit.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\QC\Frm_IQCLookups.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Include="DevFrm\QC\Frm_IQCLookups.Designer.cs">
      <DependentUpon>Frm_IQCLookups.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\QC\Frm_MesQmCheckitemDt.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Include="DevFrm\QC\Frm_MesQmCheckitemDt.Designer.cs">
      <DependentUpon>Frm_MesQmCheckitemDt.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\QC\Frm_MesSysLookups.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Include="DevFrm\QC\Frm_MesSysLookups.Designer.cs">
      <DependentUpon>Frm_MesSysLookups.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\QC\Models\MesQmCheckitem.cs" />
    <Compile Include="DevFrm\QC\Models\MesQmCheckitemDt.cs" />
    <Compile Include="DevFrm\QC\Models\MesSysLookups.cs" />
    <Compile Include="DevFrm\QC\Models\MesSysLookupTypes.cs" />
    <Compile Include="DevFrm\Rpt\RptPreview.cs">
      <SubType>Form</SubType>
    </Compile>
@@ -308,6 +330,12 @@
    <Compile Include="DevFrm\Warehouse\Frm_MesDepot.Designer.cs">
      <DependentUpon>Frm_MesDepot.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\Warehouse\Frm_MesInvItemArn.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Include="DevFrm\Warehouse\Frm_MesInvItemArn.Designer.cs">
      <DependentUpon>Frm_MesInvItemArn.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\Warehouse\Frm_MesRohIn.cs">
      <SubType>Form</SubType>
    </Compile>
@@ -316,6 +344,8 @@
    </Compile>
    <Compile Include="DevFrm\Warehouse\Models\MesDepots.cs" />
    <Compile Include="DevFrm\Warehouse\Models\MesDepotSections.cs" />
    <Compile Include="DevFrm\Warehouse\Models\MesInvItemArn.cs" />
    <Compile Include="DevFrm\Warehouse\Models\MesInvItemArnDetail.cs" />
    <Compile Include="Entity\LoginInfoModel.cs" />
    <Compile Include="Entity\PageQueryModel.cs" />
    <Compile Include="Entity\ReturnModel.cs" />
@@ -337,6 +367,12 @@
    <Compile Include="ToolBox\MsgHelper.cs" />
    <Compile Include="ToolBox\UpdateParentEventArgs.cs" />
    <Compile Include="ToolBox\UtilityHelper.cs" />
    <Compile Include="UserControl\SelectCgMx.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Include="UserControl\SelectCgMx.Designer.cs">
      <DependentUpon>SelectCgMx.cs</DependentUpon>
    </Compile>
    <Compile Include="UserControl\ShowRptWizard.cs">
      <SubType>Form</SubType>
    </Compile>
@@ -348,6 +384,18 @@
    </Compile>
    <Compile Include="UserControl\UcComBox.Designer.cs">
      <DependentUpon>UcComBox.cs</DependentUpon>
    </Compile>
    <Compile Include="UserControl\UcLookCk.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Include="UserControl\UcLookCk.Designer.cs">
      <DependentUpon>UcLookCk.cs</DependentUpon>
    </Compile>
    <Compile Include="UserControl\UcLookSupplier.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Include="UserControl\UcLookSupplier.Designer.cs">
      <DependentUpon>UcLookSupplier.cs</DependentUpon>
    </Compile>
    <Compile Include="UserControl\UcPageBar.cs">
      <SubType>UserControl</SubType>
@@ -409,6 +457,15 @@
    <EmbeddedResource Include="DevFrm\FrmMain.resx">
      <DependentUpon>FrmMain.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\QC\Frm_IQCLookups.resx">
      <DependentUpon>Frm_IQCLookups.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\QC\Frm_MesQmCheckitemDt.resx">
      <DependentUpon>Frm_MesQmCheckitemDt.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\QC\Frm_MesSysLookups.resx">
      <DependentUpon>Frm_MesSysLookups.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\Rpt\RptPreview.resx">
      <DependentUpon>RptPreview.cs</DependentUpon>
    </EmbeddedResource>
@@ -446,6 +503,9 @@
    <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_MesRohIn.resx">
      <DependentUpon>Frm_MesRohIn.cs</DependentUpon>
    </EmbeddedResource>
@@ -458,11 +518,20 @@
    <EmbeddedResource Include="TestForm\XtraForm1.resx">
      <DependentUpon>XtraForm1.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="UserControl\SelectCgMx.resx">
      <DependentUpon>SelectCgMx.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="UserControl\ShowRptWizard.resx">
      <DependentUpon>ShowRptWizard.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="UserControl\UcComBox.resx">
      <DependentUpon>UcComBox.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="UserControl\UcLookCk.resx">
      <DependentUpon>UcLookCk.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="UserControl\UcLookSupplier.resx">
      <DependentUpon>UcLookSupplier.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="UserControl\UcPageBar.resx">
      <DependentUpon>UcPageBar.cs</DependentUpon>
@@ -564,6 +633,13 @@
    <None Include="Resources\alignmiddlecenter_32x32.png" />
    <None Include="Resources\formatnumbergeneral_16x16.png" />
    <None Include="Resources\sortasc_16x16.png" />
    <None Include="Resources\checkbuttons_32x32.png" />
    <None Include="Resources\checkbuttons_16x16.png" />
    <None Include="Resources\radiobuttons_32x32.png" />
    <None Include="Resources\radiobuttons_16x16.png" />
    <None Include="Resources\lookup&amp;reference_16x16.png" />
    <None Include="Resources\task_16x16.png" />
    <None Include="Resources\checkbuttons_16x161.png" />
    <Content Include="Resources\user_16x16.png" />
  </ItemGroup>
  <ItemGroup />
@@ -588,10 +664,10 @@
    <Error Condition="!Exists('..\packages\Microsoft.Web.WebView2.1.0.2592.51\build\Microsoft.Web.WebView2.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Web.WebView2.1.0.2592.51\build\Microsoft.Web.WebView2.targets'))" />
  </Target>
  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
       Other similar extension points exist, see Microsoft.Common.targets.
  <Target Name="BeforeBuild">
  </Target>
  <Target Name="AfterBuild">
  </Target>
  -->
         Other similar extension points exist, see Microsoft.Common.targets.
    <Target Name="BeforeBuild">
    </Target>
    <Target Name="AfterBuild">
    </Target>
    -->
</Project>