From c42e01627d34dc2ff3d18cc47b2018de3dbef36d Mon Sep 17 00:00:00 2001
From: cdk <2441919651@qq.com>
Date: 星期五, 25 七月 2025 15:15:34 +0800
Subject: [PATCH] 计件工资样式调整
---
DevApp/Gs.DevApp/Gs.DevApp.csproj | 139 ++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 122 insertions(+), 17 deletions(-)
diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index e8477a0..ac3e49c 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" />
@@ -413,6 +410,54 @@
<Compile Include="DevFrm\IPQC\Frm_XunJianDetect01.Designer.cs">
<DependentUpon>Frm_XunJianDetect01.cs</DependentUpon>
</Compile>
+ <Compile Include="DevFrm\JJGZ\Frm_MesAttanCon.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\JJGZ\Frm_MesAttanCon.Designer.cs">
+ <DependentUpon>Frm_MesAttanCon.cs</DependentUpon>
+ </Compile>
+ <Compile Include="DevFrm\JJGZ\Frm_MESJJERRORJS.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\JJGZ\Frm_MESJJERRORJS.Designer.cs">
+ <DependentUpon>Frm_MESJJERRORJS.cs</DependentUpon>
+ </Compile>
+ <Compile Include="DevFrm\JJGZ\Frm_MesJJSalary.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\JJGZ\Frm_MesJJSalary.Designer.cs">
+ <DependentUpon>Frm_MesJJSalary.cs</DependentUpon>
+ </Compile>
+ <Compile Include="DevFrm\JJGZ\Frm_MesJSSalary.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\JJGZ\Frm_MesJSSalary.Designer.cs">
+ <DependentUpon>Frm_MesJSSalary.cs</DependentUpon>
+ </Compile>
+ <Compile Include="DevFrm\JJGZ\Frm_MesTimeType.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\JJGZ\Frm_MesTimeType.Designer.cs">
+ <DependentUpon>Frm_MesTimeType.cs</DependentUpon>
+ </Compile>
+ <Compile Include="DevFrm\JJGZ\KQCX.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\JJGZ\KQCX.Designer.cs">
+ <DependentUpon>KQCX.cs</DependentUpon>
+ </Compile>
+ <Compile Include="DevFrm\JJGZ\SelectSTAFF.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\JJGZ\SelectSTAFF.Designer.cs">
+ <DependentUpon>SelectSTAFF.cs</DependentUpon>
+ </Compile>
+ <Compile Include="DevFrm\JJGZ\SetLB.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\JJGZ\SetLB.Designer.cs">
+ <DependentUpon>SetLB.cs</DependentUpon>
+ </Compile>
<Compile Include="DevFrm\PDA\Frm_AreaBind.cs">
<SubType>Form</SubType>
</Compile>
@@ -626,6 +671,12 @@
<Compile Include="DevFrm\RkQC\Frm_SctlDetect01.Designer.cs">
<DependentUpon>Frm_SctlDetect01.cs</DependentUpon>
</Compile>
+ <Compile Include="DevFrm\RkQC\Frm_WwrkDetect01.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\RkQC\Frm_WwrkDetect01.Designer.cs">
+ <DependentUpon>Frm_WwrkDetect01.cs</DependentUpon>
+ </Compile>
<Compile Include="DevFrm\RkQC\Frm_XsthDetect01.cs">
<SubType>Form</SubType>
</Compile>
@@ -697,6 +748,18 @@
</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\Rpt\WomShjhShow.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\Rpt\WomShjhShow.Designer.cs">
+ <DependentUpon>WomShjhShow.cs</DependentUpon>
</Compile>
<Compile Include="DevFrm\Sales\Frm_SalesDeliverDj.cs">
<SubType>Form</SubType>
@@ -1045,6 +1108,12 @@
</Compile>
<Compile Include="UserControl\SelectDeleteBar.Designer.cs">
<DependentUpon>SelectDeleteBar.cs</DependentUpon>
+ </Compile>
+ <Compile Include="UserControl\SelectMesCgthSqLink.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="UserControl\SelectMesCgthSqLink.Designer.cs">
+ <DependentUpon>SelectMesCgthSqLink.cs</DependentUpon>
</Compile>
<Compile Include="UserControl\SelectSrm.cs">
<SubType>Form</SubType>
@@ -1543,6 +1612,30 @@
<EmbeddedResource Include="DevFrm\IPQC\Frm_XunJianDetect01Show.resx">
<DependentUpon>Frm_XunJianDetect01Show.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\JJGZ\Frm_MesAttanCon.resx">
+ <DependentUpon>Frm_MesAttanCon.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\JJGZ\Frm_MESJJERRORJS.resx">
+ <DependentUpon>Frm_MESJJERRORJS.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\JJGZ\Frm_MesJJSalary.resx">
+ <DependentUpon>Frm_MesJJSalary.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\JJGZ\Frm_MesJSSalary.resx">
+ <DependentUpon>Frm_MesJSSalary.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\JJGZ\Frm_MesTimeType.resx">
+ <DependentUpon>Frm_MesTimeType.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\JJGZ\KQCX.resx">
+ <DependentUpon>KQCX.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\JJGZ\SelectSTAFF.resx">
+ <DependentUpon>SelectSTAFF.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\JJGZ\SetLB.resx">
+ <DependentUpon>SetLB.cs</DependentUpon>
+ </EmbeddedResource>
<EmbeddedResource Include="DevFrm\PDA\Frm_AreaBind.resx">
<DependentUpon>Frm_AreaBind.cs</DependentUpon>
</EmbeddedResource>
@@ -1609,6 +1702,9 @@
<EmbeddedResource Include="DevFrm\QC\MesQcExceptional.resx">
<DependentUpon>MesQcExceptional.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\RkQC\Frm_CqDetect01.resx">
+ <DependentUpon>Frm_CqDetect01.cs</DependentUpon>
+ </EmbeddedResource>
<EmbeddedResource Include="DevFrm\RkQC\Frm_Cqfa.resx">
<DependentUpon>Frm_Cqfa.cs</DependentUpon>
</EmbeddedResource>
@@ -1653,6 +1749,12 @@
</EmbeddedResource>
<EmbeddedResource Include="DevFrm\Rpt\QLCX.resx">
<DependentUpon>QLCX.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\Rpt\WomShjh.resx">
+ <DependentUpon>WomShjh.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\Rpt\WomShjhShow.resx">
+ <DependentUpon>WomShjhShow.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="DevFrm\Sales\Frm_SalesDeliverDj.resx">
<DependentUpon>Frm_SalesDeliverDj.cs</DependentUpon>
@@ -1819,6 +1921,9 @@
</EmbeddedResource>
<EmbeddedResource Include="UserControl\SelectDeleteBar.resx">
<DependentUpon>SelectDeleteBar.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="UserControl\SelectMesCgthSqLink.resx">
+ <DependentUpon>SelectMesCgthSqLink.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="UserControl\SelectSrm.resx">
<DependentUpon>SelectSrm.cs</DependentUpon>
@@ -2324,12 +2429,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