From 2bf1c34ff73d99de936d8880924f66111406dbd6 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期六, 02 十一月 2024 16:43:49 +0800
Subject: [PATCH] 1
---
DevApp/Gs.DevApp/Gs.DevApp.csproj | 191 ++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 184 insertions(+), 7 deletions(-)
diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index df3d07d..76e11b3 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -223,12 +223,57 @@
<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_MesQaItemsDetect01.Designer.cs">
+ <DependentUpon>Frm_MesQaItemsDetect01.cs</DependentUpon>
+ </Compile>
+ <Compile Include="DevFrm\QC\Frm_MesQaItemsDetect01.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\QC\Frm_MesQaItemsDetect01Check.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\QC\Frm_MesQaItemsDetect01Check.Designer.cs">
+ <DependentUpon>Frm_MesQaItemsDetect01Check.cs</DependentUpon>
+ </Compile>
+ <Compile Include="DevFrm\QC\Frm_MesQaMj.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\QC\Frm_MesQaMj.Designer.cs">
+ <DependentUpon>Frm_MesQaMj.cs</DependentUpon>
+ </Compile>
+ <Compile Include="DevFrm\QC\Frm_MesQmAql1.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\QC\Frm_MesQmAql1.Designer.cs">
+ <DependentUpon>Frm_MesQmAql1.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\MesQaMj.cs" />
+ <Compile Include="DevFrm\QC\Models\MesQaItemsDetect01.cs" />
+ <Compile Include="DevFrm\QC\Models\MesQaItemsDetectDetail12.cs" />
+ <Compile Include="DevFrm\QC\Models\MesQaItemsDetectDetail5.cs" />
+ <Compile Include="DevFrm\QC\Models\MesQmAql1.cs" />
+ <Compile Include="DevFrm\QC\Models\MesQmAql2.cs" />
+ <Compile Include="DevFrm\QC\Models\MesQmAql3.cs" />
+ <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">
@@ -292,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>
@@ -322,6 +373,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>
@@ -332,6 +389,9 @@
<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\MesInvItemStocks.cs" />
+ <Compile Include="DevFrm\Warehouse\Models\MesItems.cs" />
<Compile Include="Entity\LoginInfoModel.cs" />
<Compile Include="Entity\PageQueryModel.cs" />
<Compile Include="Entity\ReturnModel.cs" />
@@ -359,6 +419,18 @@
<Compile Include="UserControl\SelectCgMx.Designer.cs">
<DependentUpon>SelectCgMx.cs</DependentUpon>
</Compile>
+ <Compile Include="UserControl\SelectCheckDt.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="UserControl\SelectCheckDt.Designer.cs">
+ <DependentUpon>SelectCheckDt.cs</DependentUpon>
+ </Compile>
+ <Compile Include="UserControl\ShowLogcs.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="UserControl\ShowLogcs.Designer.cs">
+ <DependentUpon>ShowLogcs.cs</DependentUpon>
+ </Compile>
<Compile Include="UserControl\ShowRptWizard.cs">
<SubType>Form</SubType>
</Compile>
@@ -370,6 +442,24 @@
</Compile>
<Compile Include="UserControl\UcComBox.Designer.cs">
<DependentUpon>UcComBox.cs</DependentUpon>
+ </Compile>
+ <Compile Include="UserControl\UcLoading.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="UserControl\UcLoading.Designer.cs">
+ <DependentUpon>UcLoading.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\UcLookItems.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Include="UserControl\UcLookItems.Designer.cs">
+ <DependentUpon>UcLookItems.cs</DependentUpon>
</Compile>
<Compile Include="UserControl\UcLookSupplier.cs">
<SubType>UserControl</SubType>
@@ -400,6 +490,12 @@
</Compile>
<Compile Include="UserControl\UcToolBarMenu.Designer.cs">
<DependentUpon>UcToolBarMenu.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>
@@ -437,6 +533,24 @@
<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_MesQaItemsDetect01.resx">
+ <DependentUpon>Frm_MesQaItemsDetect01.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\QC\Frm_MesQaItemsDetect01Check.resx">
+ <DependentUpon>Frm_MesQaItemsDetect01Check.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\QC\Frm_MesQaMj.resx">
+ <DependentUpon>Frm_MesQaMj.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\QC\Frm_MesQmAql1.resx">
+ <DependentUpon>Frm_MesQmAql1.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>
@@ -465,6 +579,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>
@@ -480,14 +597,17 @@
<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>
</EmbeddedResource>
<EmbeddedResource Include="Properties\licenses.licx" />
<EmbeddedResource Include="Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>
- <LastGenOutput>Resources.Designer.cs</LastGenOutput>
<SubType>Designer</SubType>
+ <LastGenOutput>Resources.Designer.cs</LastGenOutput>
</EmbeddedResource>
<EmbeddedResource Include="TestForm\XtraForm1.resx">
<DependentUpon>XtraForm1.cs</DependentUpon>
@@ -495,11 +615,26 @@
<EmbeddedResource Include="UserControl\SelectCgMx.resx">
<DependentUpon>SelectCgMx.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="UserControl\SelectCheckDt.resx">
+ <DependentUpon>SelectCheckDt.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="UserControl\ShowLogcs.resx">
+ <DependentUpon>ShowLogcs.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\UcLoading.resx">
+ <DependentUpon>UcLoading.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="UserControl\UcLookCk.resx">
+ <DependentUpon>UcLookCk.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="UserControl\UcLookItems.resx">
+ <DependentUpon>UcLookItems.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="UserControl\UcLookSupplier.resx">
<DependentUpon>UcLookSupplier.cs</DependentUpon>
@@ -516,6 +651,9 @@
<EmbeddedResource Include="UserControl\UcToolBarMenu.resx">
<DependentUpon>UcToolBarMenu.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">
@@ -530,6 +668,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" />
@@ -611,6 +753,41 @@
<None Include="Resources\lookup&reference_16x16.png" />
<None Include="Resources\task_16x16.png" />
<None Include="Resources\checkbuttons_16x161.png" />
+ <None Include="Resources\boposition2_32x32.png" />
+ <None Include="Resources\boposition2_16x161.png" />
+ <None Include="Resources\ide_16x16.png" />
+ <None Include="Resources\spellcheck_16x16.png" />
+ <None Include="Resources\clearformatting_16x16.png" />
+ <None Include="Resources\sortandfilter_16x16.png" />
+ <Compile Include="DevFrm\QC\Models\MesQaItemsDetect01.cs" />
+ <Compile Include="DevFrm\QC\Models\MesQaItemsDetectDetail12.cs" />
+ <Compile Include="DevFrm\QC\Models\MesQaItemsDetectDetail5.cs" />
+ <None Include="Resources\deletetablecells_32x32.png" />
+ <None Include="Resources\deletetablecells_16x16.png" />
+ <None Include="Resources\checkbox2_32x322.png" />
+ <None Include="Resources\checkbox2_16x161.png" />
+ <None Include="Resources\forcetesting_32x321.png" />
+ <None Include="Resources\forcetesting_16x161.png" />
+ <None Include="Resources\trackingchanges_showmarkup_32x32.png" />
+ <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 />
@@ -635,10 +812,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>
\ No newline at end of file
--
Gitblit v1.9.3