From 6ab82e2c95d6ad274983c985bde0175bb436719f Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期六, 09 十一月 2024 18:07:56 +0800
Subject: [PATCH] 1
---
DevApp/Gs.DevApp/Gs.DevApp.csproj | 190 +++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 189 insertions(+), 1 deletions(-)
diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index 732d396..aa8803a 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -1,4 +1,7 @@
锘�<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="..\packages\CefSharp.Common.129.0.110\build\CefSharp.Common.props" Condition="Exists('..\packages\CefSharp.Common.129.0.110\build\CefSharp.Common.props')" />
+ <Import Project="..\packages\chromiumembeddedframework.runtime.win-x86.129.0.11\build\chromiumembeddedframework.runtime.win-x86.props" Condition="Exists('..\packages\chromiumembeddedframework.runtime.win-x86.129.0.11\build\chromiumembeddedframework.runtime.win-x86.props')" />
+ <Import Project="..\packages\chromiumembeddedframework.runtime.win-x64.129.0.11\build\chromiumembeddedframework.runtime.win-x64.props" Condition="Exists('..\packages\chromiumembeddedframework.runtime.win-x64.129.0.11\build\chromiumembeddedframework.runtime.win-x64.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">x86</Platform>
@@ -58,6 +61,15 @@
<ItemGroup>
<Reference Include="AutoUpdater.NET, Version=1.9.2.0, Culture=neutral, PublicKeyToken=501435c91b35f4bc, processorArchitecture=MSIL">
<HintPath>..\packages\Autoupdater.NET.Official.1.9.2\lib\net462\AutoUpdater.NET.dll</HintPath>
+ </Reference>
+ <Reference Include="CefSharp, Version=129.0.110.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138, processorArchitecture=MSIL">
+ <HintPath>..\packages\CefSharp.Common.129.0.110\lib\net462\CefSharp.dll</HintPath>
+ </Reference>
+ <Reference Include="CefSharp.Core, Version=129.0.110.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138, processorArchitecture=MSIL">
+ <HintPath>..\packages\CefSharp.Common.129.0.110\lib\net462\CefSharp.Core.dll</HintPath>
+ </Reference>
+ <Reference Include="CefSharp.WinForms, Version=129.0.110.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138, processorArchitecture=MSIL">
+ <HintPath>..\packages\CefSharp.WinForms.129.0.110\lib\net462\CefSharp.WinForms.dll</HintPath>
</Reference>
<Reference Include="DevExpress.BonusSkins.v22.2" />
<Reference Include="DevExpress.Charts.v22.2.Core, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
@@ -229,6 +241,24 @@
<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>
@@ -247,6 +277,10 @@
<Compile Include="DevFrm\QC\Frm_MesSysLookups.Designer.cs">
<DependentUpon>Frm_MesSysLookups.cs</DependentUpon>
</Compile>
+ <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\MesQaMj.cs" />
<Compile Include="DevFrm\QC\Models\MesQmAql1.cs" />
<Compile Include="DevFrm\QC\Models\MesQmAql2.cs" />
<Compile Include="DevFrm\QC\Models\MesQmAql3.cs" />
@@ -315,6 +349,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>
@@ -333,6 +373,12 @@
<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>
</Compile>
@@ -345,6 +391,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>
@@ -355,6 +407,13 @@
<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\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" />
@@ -372,6 +431,18 @@
<Compile Include="TestForm\XtraForm1.Designer.cs">
<DependentUpon>XtraForm1.cs</DependentUpon>
</Compile>
+ <Compile Include="TestForm\XtraForm2.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <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" />
@@ -388,6 +459,18 @@
<Compile Include="UserControl\SelectCheckDt.Designer.cs">
<DependentUpon>SelectCheckDt.cs</DependentUpon>
</Compile>
+ <Compile Include="UserControl\ShowFile.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="UserControl\ShowFile.Designer.cs">
+ <DependentUpon>ShowFile.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>
@@ -399,6 +482,12 @@
</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>
@@ -442,6 +531,18 @@
<Compile Include="UserControl\UcToolBarMenu.Designer.cs">
<DependentUpon>UcToolBarMenu.cs</DependentUpon>
</Compile>
+ <Compile Include="UserControl\UCUpFile.cs">
+ <SubType>UserControl</SubType>
+ </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>
</EmbeddedResource>
@@ -481,6 +582,15 @@
<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>
@@ -515,6 +625,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>
@@ -524,11 +637,17 @@
<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>
</EmbeddedResource>
<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>
@@ -536,11 +655,17 @@
<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>
+ </EmbeddedResource>
+ <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>
@@ -548,11 +673,20 @@
<EmbeddedResource Include="UserControl\SelectCheckDt.resx">
<DependentUpon>SelectCheckDt.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="UserControl\ShowFile.resx">
+ <DependentUpon>ShowFile.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>
@@ -575,6 +709,12 @@
<EmbeddedResource Include="UserControl\UcToolBarMenu.resx">
<DependentUpon>UcToolBarMenu.cs</DependentUpon>
</EmbeddedResource>
+ <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">
@@ -589,6 +729,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" />
@@ -670,6 +814,45 @@
<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" />
+ <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" />
+ <None Include="Resources\refresh_32x321.png" />
+ <None Include="Resources\trackingchanges_previous_32x32.png" />
+ <None Include="Resources\trackingchanges_previous_16x16.png" />
+ <None Include="Resources\updatetableofcontents_32x32.png" />
+ <None Include="Resources\updatetableofcontents_16x16.png" />
+ <None Include="Resources\close_16x16.png" />
+ <None Include="Resources\print_16x16.png" />
<Content Include="Resources\user_16x16.png" />
</ItemGroup>
<ItemGroup />
@@ -692,7 +875,12 @@
<ErrorText>杩欏彴璁＄畻鏈轰笂缂哄皯姝ら」鐩紩鐢ㄧ殑 NuGet 绋嬪簭鍖呫�備娇鐢ㄢ�淣uGet 绋嬪簭鍖呰繕鍘熲�濆彲涓嬭浇杩欎簺绋嬪簭鍖呫�傛湁鍏虫洿澶氫俊鎭紝璇峰弬瑙� http://go.microsoft.com/fwlink/?LinkID=322105銆傜己灏戠殑鏂囦欢鏄� {0}銆�</ErrorText>
</PropertyGroup>
<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'))" />
+ <Error Condition="!Exists('..\packages\chromiumembeddedframework.runtime.win-x64.129.0.11\build\chromiumembeddedframework.runtime.win-x64.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\chromiumembeddedframework.runtime.win-x64.129.0.11\build\chromiumembeddedframework.runtime.win-x64.props'))" />
+ <Error Condition="!Exists('..\packages\chromiumembeddedframework.runtime.win-x86.129.0.11\build\chromiumembeddedframework.runtime.win-x86.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\chromiumembeddedframework.runtime.win-x86.129.0.11\build\chromiumembeddedframework.runtime.win-x86.props'))" />
+ <Error Condition="!Exists('..\packages\CefSharp.Common.129.0.110\build\CefSharp.Common.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CefSharp.Common.129.0.110\build\CefSharp.Common.props'))" />
+ <Error Condition="!Exists('..\packages\CefSharp.Common.129.0.110\build\CefSharp.Common.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CefSharp.Common.129.0.110\build\CefSharp.Common.targets'))" />
</Target>
+ <Import Project="..\packages\CefSharp.Common.129.0.110\build\CefSharp.Common.targets" Condition="Exists('..\packages\CefSharp.Common.129.0.110\build\CefSharp.Common.targets')" />
<!-- 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">
--
Gitblit v1.9.3