From 84e8197da9284b10eb6fca4cd7a8931406d97ad6 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期六, 12 七月 2025 16:22:14 +0800
Subject: [PATCH] bug
---
DevApp/Gs.DevApp/Gs.DevApp.csproj | 279 ++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 262 insertions(+), 17 deletions(-)
diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index 6ea4d93..eacfe6d 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -1,7 +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')" />
+ <Import Project="..\packages\CefSharp.Common.109.1.110\build\CefSharp.Common.props" Condition="Exists('..\packages\CefSharp.Common.109.1.110\build\CefSharp.Common.props')" />
+ <Import Project="..\packages\cef.redist.x86.109.1.11\build\cef.redist.x86.props" Condition="Exists('..\packages\cef.redist.x86.109.1.11\build\cef.redist.x86.props')" />
+ <Import Project="..\packages\cef.redist.x64.109.1.11\build\cef.redist.x64.props" Condition="Exists('..\packages\cef.redist.x64.109.1.11\build\cef.redist.x64.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">x86</Platform>
@@ -63,14 +63,14 @@
<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 Include="CefSharp, Version=109.1.110.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138, processorArchitecture=MSIL">
+ <HintPath>..\packages\CefSharp.Common.109.1.110\lib\net452\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 Include="CefSharp.Core, Version=109.1.110.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138, processorArchitecture=MSIL">
+ <HintPath>..\packages\CefSharp.Common.109.1.110\lib\net452\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 Include="CefSharp.WinForms, Version=109.1.110.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138, processorArchitecture=MSIL">
+ <HintPath>..\packages\CefSharp.WinForms.109.1.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" />
@@ -120,9 +120,6 @@
</Reference>
<Reference Include="NModbus, Version=3.0.81.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\NModbus.3.0.81\lib\net46\NModbus.dll</HintPath>
- </Reference>
- <Reference Include="Oracle.ManagedDataAccess, Version=4.122.23.1, Culture=neutral, PublicKeyToken=89b483f429c47342, processorArchitecture=MSIL">
- <HintPath>..\packages\Oracle.ManagedDataAccess.23.6.0\lib\net472\Oracle.ManagedDataAccess.dll</HintPath>
</Reference>
<Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" />
@@ -203,6 +200,12 @@
<Compile Include="DevFrm\BasicData\Frm_MesItems.Designer.cs">
<DependentUpon>Frm_MesItems.cs</DependentUpon>
</Compile>
+ <Compile Include="DevFrm\BasicData\Frm_MesItemsShow.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\BasicData\Frm_MesItemsShow.Designer.cs">
+ <DependentUpon>Frm_MesItemsShow.cs</DependentUpon>
+ </Compile>
<Compile Include="DevFrm\BasicData\Frm_MesItemType.cs">
<SubType>Form</SubType>
</Compile>
@@ -232,6 +235,12 @@
</Compile>
<Compile Include="DevFrm\BasicData\Frm_MesUnit.Designer.cs">
<DependentUpon>Frm_MesUnit.cs</DependentUpon>
+ </Compile>
+ <Compile Include="DevFrm\BasicData\Frm_SupplierSrm.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\BasicData\Frm_SupplierSrm.Designer.cs">
+ <DependentUpon>Frm_SupplierSrm.cs</DependentUpon>
</Compile>
<Compile Include="DevFrm\Ck\Frm_MesCgthSq.cs">
<SubType>Form</SubType>
@@ -293,6 +302,12 @@
<Compile Include="DevFrm\Ck\Frm_MesSctkSqDj.Designer.cs">
<DependentUpon>Frm_MesSctkSqDj.cs</DependentUpon>
</Compile>
+ <Compile Include="DevFrm\Ck\Frm_MesYanTui.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\Ck\Frm_MesYanTui.Designer.cs">
+ <DependentUpon>Frm_MesYanTui.cs</DependentUpon>
+ </Compile>
<Compile Include="DevFrm\Ck\SelectSctk.cs">
<SubType>Form</SubType>
</Compile>
@@ -310,6 +325,12 @@
</Compile>
<Compile Include="DevFrm\Ck\UcBlclDj.Designer.cs">
<DependentUpon>UcBlclDj.cs</DependentUpon>
+ </Compile>
+ <Compile Include="DevFrm\Ck\UcBlclSelect.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\Ck\UcBlclSelect.Designer.cs">
+ <DependentUpon>UcBlclSelect.cs</DependentUpon>
</Compile>
<Compile Include="DevFrm\FQC\Frm_Fqc.cs">
<SubType>Form</SubType>
@@ -352,6 +373,12 @@
</Compile>
<Compile Include="DevFrm\FrmMain.Designer.cs">
<DependentUpon>FrmMain.cs</DependentUpon>
+ </Compile>
+ <Compile Include="DevFrm\IPQC\Frm_ShouJianDetect01H5.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\IPQC\Frm_ShouJianDetect01H5.Designer.cs">
+ <DependentUpon>Frm_ShouJianDetect01H5.cs</DependentUpon>
</Compile>
<Compile Include="DevFrm\IPQC\Frm_XunJianDetect01Show.cs">
<SubType>Form</SubType>
@@ -461,6 +488,12 @@
<Compile Include="DevFrm\QC\DefectCodeDaa.Designer.cs">
<DependentUpon>DefectCodeDaa.cs</DependentUpon>
</Compile>
+ <Compile Include="DevFrm\QC\DefectCodeShouJian.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\QC\DefectCodeShouJian.Designer.cs">
+ <DependentUpon>DefectCodeShouJian.cs</DependentUpon>
+ </Compile>
<Compile Include="DevFrm\QC\DefectCodeXianChang.cs">
<SubType>Form</SubType>
</Compile>
@@ -554,6 +587,60 @@
<Compile Include="DevFrm\QC\Models\MesQmCheckitemDt.cs" />
<Compile Include="DevFrm\QC\Models\MesSysLookups.cs" />
<Compile Include="DevFrm\QC\Models\MesSysLookupTypes.cs" />
+ <Compile Include="DevFrm\RkQC\Frm_CqDetect01.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\RkQC\Frm_CqDetect01.Designer.cs">
+ <DependentUpon>Frm_CqDetect01.cs</DependentUpon>
+ </Compile>
+ <Compile Include="DevFrm\RkQC\Frm_Cqfa.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\RkQC\Frm_Cqfa.Designer.cs">
+ <DependentUpon>Frm_Cqfa.cs</DependentUpon>
+ </Compile>
+ <Compile Include="DevFrm\RkQC\Frm_CqfaItems.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Include="DevFrm\RkQC\Frm_CqfaItems.Designer.cs">
+ <DependentUpon>Frm_CqfaItems.cs</DependentUpon>
+ </Compile>
+ <Compile Include="DevFrm\RkQC\Frm_Cqsq.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\RkQC\Frm_Cqsq.Designer.cs">
+ <DependentUpon>Frm_Cqsq.cs</DependentUpon>
+ </Compile>
+ <Compile Include="DevFrm\RkQC\Frm_QtrkDetect01.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\RkQC\Frm_QtrkDetect01.Designer.cs">
+ <DependentUpon>Frm_QtrkDetect01.cs</DependentUpon>
+ </Compile>
+ <Compile Include="DevFrm\RkQC\Frm_SctlDetect01.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\RkQC\Frm_SctlDetect01.Designer.cs">
+ <DependentUpon>Frm_SctlDetect01.cs</DependentUpon>
+ </Compile>
+ <Compile Include="DevFrm\RkQC\Frm_XsthDetect01.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\RkQC\Frm_XsthDetect01.Designer.cs">
+ <DependentUpon>Frm_XsthDetect01.cs</DependentUpon>
+ </Compile>
+ <Compile Include="DevFrm\RkQC\RkDetect01.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Include="DevFrm\RkQC\RkDetect01.Designer.cs">
+ <DependentUpon>RkDetect01.cs</DependentUpon>
+ </Compile>
+ <Compile Include="DevFrm\RkQC\SelectCqsq.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\RkQC\SelectCqsq.Designer.cs">
+ <DependentUpon>SelectCqsq.cs</DependentUpon>
+ </Compile>
<Compile Include="DevFrm\Rk\Frm_MesInvItemIns.cs">
<SubType>Form</SubType>
</Compile>
@@ -565,6 +652,12 @@
</Compile>
<Compile Include="DevFrm\Rk\Frm_MesItemQtrkDj.Designer.cs">
<DependentUpon>Frm_MesItemQtrkDj.cs</DependentUpon>
+ </Compile>
+ <Compile Include="DevFrm\Rk\Frm_MesItemTblShow.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\Rk\Frm_MesItemTblShow.Designer.cs">
+ <DependentUpon>Frm_MesItemTblShow.cs</DependentUpon>
</Compile>
<Compile Include="DevFrm\Rk\HistoryDhmxcs.cs">
<SubType>Form</SubType>
@@ -583,6 +676,30 @@
</Compile>
<Compile Include="DevFrm\Rpt\CKTmkc.Designer.cs">
<DependentUpon>CKTmkc.cs</DependentUpon>
+ </Compile>
+ <Compile Include="DevFrm\Rpt\CkYtmx.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\Rpt\CkYtmx.Designer.cs">
+ <DependentUpon>CkYtmx.cs</DependentUpon>
+ </Compile>
+ <Compile Include="DevFrm\Rpt\Frm_MesQL.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\Rpt\Frm_MesQL.Designer.cs">
+ <DependentUpon>Frm_MesQL.cs</DependentUpon>
+ </Compile>
+ <Compile Include="DevFrm\Rpt\QLCX.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\Rpt\QLCX.Designer.cs">
+ <DependentUpon>QLCX.cs</DependentUpon>
+ </Compile>
+ <Compile Include="DevFrm\Rpt\WomShjh.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\Rpt\WomShjh.Designer.cs">
+ <DependentUpon>WomShjh.cs</DependentUpon>
</Compile>
<Compile Include="DevFrm\Sales\Frm_SalesDeliverDj.cs">
<SubType>Form</SubType>
@@ -619,6 +736,18 @@
</Compile>
<Compile Include="DevFrm\Sys\EasyRptEdt.Designer.cs">
<DependentUpon>EasyRptEdt.cs</DependentUpon>
+ </Compile>
+ <Compile Include="DevFrm\Sys\EasyRptEdtShow.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\Sys\EasyRptEdtShow.Designer.cs">
+ <DependentUpon>EasyRptEdtShow.cs</DependentUpon>
+ </Compile>
+ <Compile Include="DevFrm\Sys\Frm_Config.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\Sys\Frm_Config.Designer.cs">
+ <DependentUpon>Frm_Config.cs</DependentUpon>
</Compile>
<Compile Include="DevFrm\User\ViewRole.cs">
<SubType>Form</SubType>
@@ -819,6 +948,12 @@
<Compile Include="DevFrm\Warehouse\Models\MesDepotSections.cs" />
<Compile Include="DevFrm\Warehouse\Models\MesInvItemOutCDetails.cs" />
<Compile Include="DevFrm\Warehouse\Models\MesInvItemOutItems.cs" />
+ <Compile Include="DevFrm\WOM\FrmBackFlash.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\WOM\FrmBackFlash.Designer.cs">
+ <DependentUpon>FrmBackFlash.cs</DependentUpon>
+ </Compile>
<Compile Include="DevFrm\WOM\Frm_MesScrkDj.cs">
<SubType>Form</SubType>
</Compile>
@@ -830,6 +965,12 @@
</Compile>
<Compile Include="DevFrm\WOM\Frm_MesWorkProd.Designer.cs">
<DependentUpon>Frm_MesWorkProd.cs</DependentUpon>
+ </Compile>
+ <Compile Include="DevFrm\WOM\Frm_WomFanGong.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\WOM\Frm_WomFanGong.Designer.cs">
+ <DependentUpon>Frm_WomFanGong.cs</DependentUpon>
</Compile>
<Compile Include="DevFrm\WOM\ShowJieAn.cs">
<SubType>Form</SubType>
@@ -895,6 +1036,24 @@
</Compile>
<Compile Include="UserControl\SelectCk.Designer.cs">
<DependentUpon>SelectCk.cs</DependentUpon>
+ </Compile>
+ <Compile Include="UserControl\SelectDaa.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="UserControl\SelectDaa.Designer.cs">
+ <DependentUpon>SelectDaa.cs</DependentUpon>
+ </Compile>
+ <Compile Include="UserControl\SelectDeleteBar.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="UserControl\SelectDeleteBar.Designer.cs">
+ <DependentUpon>SelectDeleteBar.cs</DependentUpon>
+ </Compile>
+ <Compile Include="UserControl\SelectSrm.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="UserControl\SelectSrm.Designer.cs">
+ <DependentUpon>SelectSrm.cs</DependentUpon>
</Compile>
<Compile Include="UserControl\UcDictionaryComBox.cs">
<SubType>UserControl</SubType>
@@ -1281,6 +1440,9 @@
<EmbeddedResource Include="DevFrm\BasicData\Frm_MesItems.resx">
<DependentUpon>Frm_MesItems.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\BasicData\Frm_MesItemsShow.resx">
+ <DependentUpon>Frm_MesItemsShow.cs</DependentUpon>
+ </EmbeddedResource>
<EmbeddedResource Include="DevFrm\BasicData\Frm_MesItemType.resx">
<DependentUpon>Frm_MesItemType.cs</DependentUpon>
</EmbeddedResource>
@@ -1295,6 +1457,9 @@
</EmbeddedResource>
<EmbeddedResource Include="DevFrm\BasicData\Frm_MesUnit.resx">
<DependentUpon>Frm_MesUnit.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\BasicData\Frm_SupplierSrm.resx">
+ <DependentUpon>Frm_SupplierSrm.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="DevFrm\Ck\Frm_MesCgthSq.resx">
<DependentUpon>Frm_MesCgthSq.cs</DependentUpon>
@@ -1326,6 +1491,9 @@
<EmbeddedResource Include="DevFrm\Ck\Frm_MesSctkSqDj.resx">
<DependentUpon>Frm_MesSctkSqDj.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\Ck\Frm_MesYanTui.resx">
+ <DependentUpon>Frm_MesYanTui.cs</DependentUpon>
+ </EmbeddedResource>
<EmbeddedResource Include="DevFrm\Ck\SelectSctk.resx">
<DependentUpon>SelectSctk.cs</DependentUpon>
</EmbeddedResource>
@@ -1334,6 +1502,9 @@
</EmbeddedResource>
<EmbeddedResource Include="DevFrm\Ck\UcBlclDj.resx">
<DependentUpon>UcBlclDj.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\Ck\UcBlclSelect.resx">
+ <DependentUpon>UcBlclSelect.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="DevFrm\FQC\Frm_Fqc.resx">
<DependentUpon>Frm_Fqc.cs</DependentUpon>
@@ -1365,6 +1536,9 @@
</EmbeddedResource>
<EmbeddedResource Include="DevFrm\IPQC\Frm_ShouJianDetect01.resx">
<DependentUpon>Frm_ShouJianDetect01.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\IPQC\Frm_ShouJianDetect01H5.resx">
+ <DependentUpon>Frm_ShouJianDetect01H5.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="DevFrm\IPQC\Frm_XunJianDetect01.resx">
<DependentUpon>Frm_XunJianDetect01.cs</DependentUpon>
@@ -1438,11 +1612,32 @@
<EmbeddedResource Include="DevFrm\QC\MesQcExceptional.resx">
<DependentUpon>MesQcExceptional.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\RkQC\Frm_Cqfa.resx">
+ <DependentUpon>Frm_Cqfa.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\RkQC\Frm_CqfaItems.resx">
+ <DependentUpon>Frm_CqfaItems.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\RkQC\Frm_Cqsq.resx">
+ <DependentUpon>Frm_Cqsq.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\RkQC\Frm_SctlDetect01.resx">
+ <DependentUpon>Frm_SctlDetect01.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\RkQC\RkDetect01.resx">
+ <DependentUpon>RkDetect01.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\RkQC\SelectCqsq.resx">
+ <DependentUpon>SelectCqsq.cs</DependentUpon>
+ </EmbeddedResource>
<EmbeddedResource Include="DevFrm\Rk\Frm_MesInvItemIns.resx">
<DependentUpon>Frm_MesInvItemIns.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="DevFrm\Rk\Frm_MesItemQtrkDj.resx">
<DependentUpon>Frm_MesItemQtrkDj.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\Rk\Frm_MesItemTblShow.resx">
+ <DependentUpon>Frm_MesItemTblShow.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="DevFrm\Rk\HistoryDhmxcs.resx">
<DependentUpon>HistoryDhmxcs.cs</DependentUpon>
@@ -1452,6 +1647,15 @@
</EmbeddedResource>
<EmbeddedResource Include="DevFrm\Rpt\CKTmkc.resx">
<DependentUpon>CKTmkc.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\Rpt\CkYtmx.resx">
+ <DependentUpon>CkYtmx.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\Rpt\Frm_MesQL.resx">
+ <DependentUpon>Frm_MesQL.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\Rpt\QLCX.resx">
+ <DependentUpon>QLCX.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="DevFrm\Sales\Frm_SalesDeliverDj.resx">
<DependentUpon>Frm_SalesDeliverDj.cs</DependentUpon>
@@ -1470,6 +1674,12 @@
</EmbeddedResource>
<EmbeddedResource Include="DevFrm\Sys\EasyRptEdt.resx">
<DependentUpon>EasyRptEdt.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\Sys\EasyRptEdtShow.resx">
+ <DependentUpon>EasyRptEdtShow.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\Sys\Frm_Config.resx">
+ <DependentUpon>Frm_Config.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="DevFrm\User\ViewRole.resx">
<DependentUpon>ViewRole.cs</DependentUpon>
@@ -1565,11 +1775,17 @@
<EmbeddedResource Include="DevFrm\Warehouse\Frm_MesShouTuiDj.resx">
<DependentUpon>Frm_MesShouTuiDj.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\WOM\FrmBackFlash.resx">
+ <DependentUpon>FrmBackFlash.cs</DependentUpon>
+ </EmbeddedResource>
<EmbeddedResource Include="DevFrm\WOM\Frm_MesScrkDj.resx">
<DependentUpon>Frm_MesScrkDj.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="DevFrm\WOM\Frm_MesWorkProd.resx">
<DependentUpon>Frm_MesWorkProd.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\WOM\Frm_WomFanGong.resx">
+ <DependentUpon>Frm_WomFanGong.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="DevFrm\WOM\ShowJieAn.resx">
<DependentUpon>ShowJieAn.cs</DependentUpon>
@@ -1600,6 +1816,15 @@
</EmbeddedResource>
<EmbeddedResource Include="UserControl\SelectCk.resx">
<DependentUpon>SelectCk.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="UserControl\SelectDaa.resx">
+ <DependentUpon>SelectDaa.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="UserControl\SelectDeleteBar.resx">
+ <DependentUpon>SelectDeleteBar.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="UserControl\SelectSrm.resx">
+ <DependentUpon>SelectSrm.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="UserControl\UcDictionaryComBox.resx">
<DependentUpon>UcDictionaryComBox.cs</DependentUpon>
@@ -2060,6 +2285,26 @@
<None Include="Resources\historyitem_16x16.png" />
<None Include="Resources\usergroup_16x16.png" />
<None Include="Resources\usergroup_16x161.png" />
+ <None Include="Resources\print_32x32.png" />
+ <None Include="Resources\print_32x321.png" />
+ <None Include="Resources\print_16x161.png" />
+ <None Include="Resources\print_32x322.png" />
+ <None Include="Resources\print_16x162.png" />
+ <None Include="Resources\printer_32x32.png" />
+ <None Include="Resources\printer_16x16.png" />
+ <None Include="Resources\bodetails_32x321.png" />
+ <None Include="Resources\bodetails_16x163.png" />
+ <None Include="Resources\refreshpivottable_16x16.png" />
+ <None Include="Resources\dayview_32x32.png" />
+ <None Include="Resources\dayview_16x16.png" />
+ <None Include="Resources\addfile_32x32.png" />
+ <None Include="Resources\fullstackedbar3d_16x16.png" />
+ <None Include="Resources\bofolder_16x16.png" />
+ <None Include="Resources\insert_16x16.png" />
+ <None Include="Resources\pie.svg" />
+ <None Include="Resources\useinformula_16x16.png" />
+ <None Include="Resources\boposition2_16x162.png" />
+ <None Include="Resources\apply_16x16.png" />
<Content Include="Resources\user_16x16.png" />
</ItemGroup>
<ItemGroup />
@@ -2082,12 +2327,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'))" />
+ <Error Condition="!Exists('..\packages\cef.redist.x64.109.1.11\build\cef.redist.x64.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\cef.redist.x64.109.1.11\build\cef.redist.x64.props'))" />
+ <Error Condition="!Exists('..\packages\cef.redist.x86.109.1.11\build\cef.redist.x86.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\cef.redist.x86.109.1.11\build\cef.redist.x86.props'))" />
+ <Error Condition="!Exists('..\packages\CefSharp.Common.109.1.110\build\CefSharp.Common.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CefSharp.Common.109.1.110\build\CefSharp.Common.props'))" />
+ <Error Condition="!Exists('..\packages\CefSharp.Common.109.1.110\build\CefSharp.Common.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CefSharp.Common.109.1.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')" />
+ <Import Project="..\packages\CefSharp.Common.109.1.110\build\CefSharp.Common.targets" Condition="Exists('..\packages\CefSharp.Common.109.1.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