From 0bab28c7959335969f6d07c3cb33acbeffed1de5 Mon Sep 17 00:00:00 2001 From: lu <99954486@qq.com> Date: 星期五, 29 十一月 2024 17:34:52 +0800 Subject: [PATCH] 1 --- DevApp/Gs.DevApp/Gs.DevApp.csproj | 339 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 338 insertions(+), 1 deletions(-) diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj index 732d396..0e10db2 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" /> @@ -181,6 +193,12 @@ <Compile Include="DevFrm\BasicData\Frm_Holidy.Designer.cs"> <DependentUpon>Frm_Holidy.cs</DependentUpon> </Compile> + <Compile Include="DevFrm\BasicData\Frm_MesDaaDirectOut.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Include="DevFrm\BasicData\Frm_MesDaaDirectOut.Designer.cs"> + <DependentUpon>Frm_MesDaaDirectOut.cs</DependentUpon> + </Compile> <Compile Include="DevFrm\BasicData\Frm_MesItems.cs"> <SubType>Form</SubType> </Compile> @@ -229,6 +247,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 +283,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" /> @@ -291,6 +331,18 @@ <Compile Include="DevFrm\Sys\EasyCode.Designer.cs"> <DependentUpon>EasyCode.cs</DependentUpon> </Compile> + <Compile Include="DevFrm\Sys\Frm_MesSysPageview.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Include="DevFrm\Sys\Frm_MesSysPageview.Designer.cs"> + <DependentUpon>Frm_MesSysPageview.cs</DependentUpon> + </Compile> + <Compile Include="DevFrm\Sys\SysHelp.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Include="DevFrm\Sys\SysHelp.Designer.cs"> + <DependentUpon>SysHelp.cs</DependentUpon> + </Compile> <Compile Include="DevFrm\Sys\SysLog.cs"> <SubType>Form</SubType> </Compile> @@ -315,6 +367,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 +391,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 +409,30 @@ <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_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_MesInvItemOut_SCLL.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Include="DevFrm\Warehouse\Frm_MesInvItemOut_SCLL.Designer.cs"> + <DependentUpon>Frm_MesInvItemOut_SCLL.cs</DependentUpon> + </Compile> <Compile Include="DevFrm\Warehouse\Frm_MesRohIn.cs"> <SubType>Form</SubType> </Compile> @@ -355,6 +443,40 @@ <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\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_MesWomdaahb.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Include="DevFrm\WOM\Frm_MesWomdaahb.Designer.cs"> + <DependentUpon>Frm_MesWomdaahb.cs</DependentUpon> + </Compile> + <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_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" /> @@ -372,6 +494,12 @@ <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="ToolBox\LogHelper.cs" /> <Compile Include="ToolBox\MsgHelper.cs" /> <Compile Include="ToolBox\UpdateParentEventArgs.cs" /> @@ -382,11 +510,35 @@ <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> </Compile> <Compile Include="UserControl\SelectCheckDt.Designer.cs"> <DependentUpon>SelectCheckDt.cs</DependentUpon> + </Compile> + <Compile Include="UserControl\SelectWompba.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Include="UserControl\SelectWompba.Designer.cs"> + <DependentUpon>SelectWompba.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> @@ -400,6 +552,12 @@ <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> @@ -412,11 +570,29 @@ <Compile Include="UserControl\UcLookItems.Designer.cs"> <DependentUpon>UcLookItems.cs</DependentUpon> </Compile> + <Compile Include="UserControl\UcLookOrg.cs"> + <SubType>UserControl</SubType> + </Compile> + <Compile Include="UserControl\UcLookOrg.Designer.cs"> + <DependentUpon>UcLookOrg.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\UcLookWorkline.cs"> + <SubType>UserControl</SubType> + </Compile> + <Compile Include="UserControl\UcLookWorkline.Designer.cs"> + <DependentUpon>UcLookWorkline.cs</DependentUpon> + </Compile> + <Compile Include="UserControl\UcLookWorkshop.cs"> + <SubType>UserControl</SubType> + </Compile> + <Compile Include="UserControl\UcLookWorkshop.Designer.cs"> + <DependentUpon>UcLookWorkshop.cs</DependentUpon> </Compile> <Compile Include="UserControl\UcPageBar.cs"> <SubType>UserControl</SubType> @@ -442,6 +618,12 @@ <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> <EmbeddedResource Include="DevFrm\BasicData\Frm_Customer.resx"> <DependentUpon>Frm_Customer.cs</DependentUpon> </EmbeddedResource> @@ -450,6 +632,9 @@ </EmbeddedResource> <EmbeddedResource Include="DevFrm\BasicData\Frm_Holidy.resx"> <DependentUpon>Frm_Holidy.cs</DependentUpon> + </EmbeddedResource> + <EmbeddedResource Include="DevFrm\BasicData\Frm_MesDaaDirectOut.resx"> + <DependentUpon>Frm_MesDaaDirectOut.cs</DependentUpon> </EmbeddedResource> <EmbeddedResource Include="DevFrm\BasicData\Frm_MesItems.resx"> <DependentUpon>Frm_MesItems.cs</DependentUpon> @@ -481,6 +666,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> @@ -503,6 +697,12 @@ <DependentUpon>EasyRptDesign.cs</DependentUpon> <SubType>Designer</SubType> </EmbeddedResource> + <EmbeddedResource Include="DevFrm\Sys\Frm_MesSysPageview.resx"> + <DependentUpon>Frm_MesSysPageview.cs</DependentUpon> + </EmbeddedResource> + <EmbeddedResource Include="DevFrm\Sys\SysHelp.resx"> + <DependentUpon>SysHelp.cs</DependentUpon> + </EmbeddedResource> <EmbeddedResource Include="DevFrm\Sys\SysLog.resx"> <DependentUpon>SysLog.cs</DependentUpon> </EmbeddedResource> @@ -515,6 +715,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,29 +727,71 @@ <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_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_MesInvItemOut_SCLL.resx"> + <DependentUpon>Frm_MesInvItemOut_SCLL.cs</DependentUpon> + </EmbeddedResource> <EmbeddedResource Include="DevFrm\Warehouse\Frm_MesRohIn.resx"> <DependentUpon>Frm_MesRohIn.cs</DependentUpon> + </EmbeddedResource> + <EmbeddedResource Include="DevFrm\WOM\Frm_MesWomdaahb.resx"> + <DependentUpon>Frm_MesWomdaahb.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_Wompba.resx"> + <DependentUpon>Frm_Wompba.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> </EmbeddedResource> + <EmbeddedResource Include="TestForm\XtraForm2.resx"> + <DependentUpon>XtraForm2.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> + </EmbeddedResource> + <EmbeddedResource Include="UserControl\SelectWompba.resx"> + <DependentUpon>SelectWompba.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> @@ -554,14 +799,26 @@ <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\UcLookOrg.resx"> + <DependentUpon>UcLookOrg.cs</DependentUpon> + </EmbeddedResource> <EmbeddedResource Include="UserControl\UcLookSupplier.resx"> <DependentUpon>UcLookSupplier.cs</DependentUpon> + </EmbeddedResource> + <EmbeddedResource Include="UserControl\UcLookWorkline.resx"> + <DependentUpon>UcLookWorkline.cs</DependentUpon> + </EmbeddedResource> + <EmbeddedResource Include="UserControl\UcLookWorkshop.resx"> + <DependentUpon>UcLookWorkshop.cs</DependentUpon> </EmbeddedResource> <EmbeddedResource Include="UserControl\UcPageBar.resx"> <DependentUpon>UcPageBar.cs</DependentUpon> @@ -574,6 +831,9 @@ </EmbeddedResource> <EmbeddedResource Include="UserControl\UcToolBarMenu.resx"> <DependentUpon>UcToolBarMenu.cs</DependentUpon> + </EmbeddedResource> + <EmbeddedResource Include="UserControl\UCUpFile.resx"> + <DependentUpon>UCUpFile.cs</DependentUpon> </EmbeddedResource> <None Include="App.config" /> <None Include="packages.config" /> @@ -589,6 +849,11 @@ </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" /> + <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 +935,73 @@ <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" /> + <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" /> + <None Include="Resources\drilldownonarguments_chart_32x32.png" /> + <None Include="Resources\sortasc_32x32.png" /> + <None Include="Resources\sortasc_32x321.png" /> + <None Include="Resources\sortasc_16x161.png" /> + <None Include="Resources\knowledgebasearticle_32x32.png" /> + <None Include="Resources\loadfrom_32x32.png" /> + <None Include="Resources\customizegrid_32x32.png" /> + <None Include="Resources\fill_32x321.png" /> + <None Include="Resources\copymodeldifferences_32x321.png" /> + <None Include="Resources\trackingchanges_accept_32x32.png" /> + <None Include="Resources\checkbox2_32x323.png" /> + <None Include="Resources\checkbuttons_32x322.png" /> + <None Include="Resources\iconsetarrows3_16x16.png" /> + <None Include="Resources\show_16x161.png" /> + <None Include="Resources\down_16x16.png" /> + <None Include="Resources\up2_16x16.png" /> + <None Include="Resources\renamedatasource_16x161.png" /> <Content Include="Resources\user_16x16.png" /> </ItemGroup> <ItemGroup /> @@ -692,7 +1024,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