From 23e55c258ae5ef93a8d684be60271d1af9e730c9 Mon Sep 17 00:00:00 2001 From: lu <99954486@qq.com> Date: 星期三, 20 十一月 2024 15:52:27 +0800 Subject: [PATCH] 工单 --- DevApp/Gs.DevApp/Gs.DevApp.csproj | 84 +++++++++++++++++++++++++++++++++++++---- 1 files changed, 75 insertions(+), 9 deletions(-) diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj index ba7bffa..981088a 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" /> @@ -385,6 +397,12 @@ <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_MesRohIn.cs"> <SubType>Form</SubType> </Compile> @@ -402,6 +420,24 @@ <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_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" /> @@ -440,6 +476,12 @@ </Compile> <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> @@ -512,12 +554,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> @@ -625,8 +661,20 @@ <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_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_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"> @@ -645,6 +693,9 @@ </EmbeddedResource> <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> @@ -682,9 +733,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"> @@ -699,6 +747,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" /> @@ -821,6 +870,18 @@ <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" /> <Content Include="Resources\user_16x16.png" /> </ItemGroup> <ItemGroup /> @@ -843,7 +904,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