From f7b16b2d3c9113f93c4e707b94fb1a735aa2c911 Mon Sep 17 00:00:00 2001 From: schangxiang@126.com <schangxiang@126.com> Date: 周二, 27 8月 2024 11:24:27 +0800 Subject: [PATCH] //修复下 op35 同一个件 下线时间跟下一个上线时间一模一样的问题 【Editby shaocx,2024-08-27】 --- DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/iWare_SCADA_BusinessLogical.csproj | 15 ++++++++++++--- 1 files changed, 12 insertions(+), 3 deletions(-) diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/iWare_SCADA_BusinessLogical.csproj b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/iWare_SCADA_BusinessLogical.csproj index c368587..247ca55 100644 --- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/iWare_SCADA_BusinessLogical.csproj +++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/iWare_SCADA_BusinessLogical.csproj @@ -83,6 +83,8 @@ <Compile Include="BLL\SystemValue.cs" /> <Compile Include="BLL\WorkPieceInfoManager.cs" /> <Compile Include="BLL\WorkPieceLogManager.cs" /> + <Compile Include="DataCaptureHandlerV2\DeleteDataHandler.cs" /> + <Compile Include="DataCaptureHandlerV2\OP80QualityDataHandler.cs" /> <Compile Include="DataCaptureHandlerV2\DataCaptureHandler_01.cs" /> <Compile Include="DataCaptureHandlerV2\DataCaptureHandler_OP3002.cs" /> <Compile Include="DataCaptureHandlerV2\DataCaptureHandler_02.cs" /> @@ -92,9 +94,10 @@ <Compile Include="DataCaptureHandlerV2\DataCaptureHandler_06.cs" /> <Compile Include="DataCaptureHandlerV2\DataCaptureHandler_07.cs" /> <Compile Include="DataCaptureHandlerV2\DataCaptureHandler_OP0501.cs" /> - <Compile Include="DataCaptureHandlerV2\DataCaptureHandler_OP1002.cs" /> - <Compile Include="DataCaptureHandlerV2\DataCaptureHandler_OP1003.cs" /> - <Compile Include="DataCaptureHandlerV2\DataCaptureHandler_OP1004.cs" /> + <Compile Include="DataCaptureHandlerV2\Special\DataCaptureHandler_OP7009.cs" /> + <Compile Include="DataCaptureHandlerV2\Special\DataCaptureHandler_OP1002.cs" /> + <Compile Include="DataCaptureHandlerV2\Special\DataCaptureHandler_OP1003.cs" /> + <Compile Include="DataCaptureHandlerV2\Special\DataCaptureHandler_OP1004.cs" /> <Compile Include="DataCaptureHandlerV2\AlertMonitor.cs" /> <Compile Include="DataCaptureHandlerV2\DataCaptureHandler_OP6002.cs" /> <Compile Include="DataCaptureHandler\DataCaptureHandler.cs" /> @@ -153,6 +156,8 @@ <DesignTime>True</DesignTime> <DependentUpon>Resources.resx</DependentUpon> </Compile> + <Compile Include="Utils\QualityStateHelper.cs" /> + <Compile Include="Utils\MonitorHelper.cs" /> <Compile Include="Utils\SystemHelper.cs" /> <Compile Include="Utils\ComboBoxHelper.cs" /> <Compile Include="Utils\ConfigHelper.cs" /> @@ -181,6 +186,10 @@ <ItemGroup> <None Include="App.config" /> <None Include="DLA\Dao\_system~.ini" /> + <None Include="log4net_iWare - 澶嶅埗鐢�.config"> + <SubType>Designer</SubType> + <CopyToOutputDirectory>Always</CopyToOutputDirectory> + </None> <None Include="log4net_iWare.config"> <SubType>Designer</SubType> <CopyToOutputDirectory>Always</CopyToOutputDirectory> -- Gitblit v1.9.3