From 5b77e49f12cbcfebe50a32f83a3edc54161bcc67 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周二, 02 7月 2024 09:28:14 +0800
Subject: [PATCH] 2
---
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_FormTest/Form1.cs | 15 ---------------
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_DataCapture.sln | 6 ++++++
2 files changed, 6 insertions(+), 15 deletions(-)
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_DataCapture.sln b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_DataCapture.sln
index 8c9f9b1..18759d9 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_DataCapture.sln
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_DataCapture.sln
@@ -13,6 +13,8 @@
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "iWare_SCADA_FormTest2", "iWare_SCADA_FormTest\iWare_SCADA_FormTest2.csproj", "{3B160435-00C6-4321-9D3A-A30FD23F2D4B}"
EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Test", "Test", "{7CD8BDC1-70B0-4682-90CF-CA49E8DB7F09}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -43,6 +45,10 @@
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
+ GlobalSection(NestedProjects) = preSolution
+ {A3F6EBB4-D019-4246-9789-337B860BA31E} = {7CD8BDC1-70B0-4682-90CF-CA49E8DB7F09}
+ {3B160435-00C6-4321-9D3A-A30FD23F2D4B} = {7CD8BDC1-70B0-4682-90CF-CA49E8DB7F09}
+ EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {71AEA756-11BA-4085-8E3F-7DAA18D3F7DB}
EndGlobalSection
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_FormTest/Form1.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_FormTest/Form1.cs
index 661a76c..1d8b48c 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_FormTest/Form1.cs
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_FormTest/Form1.cs
@@ -109,21 +109,6 @@
{
//缁熻
- int store_FDJ = 0;//鐜版湁鍙戝姩鏈烘暟
- int store_EmptySalver = 0;//绌烘墭鐩樻暟閲�
- int store_EmptySalver_TS = 0;//绌烘墭鐩樻墭鏁�
-
- int count_In_FDJ = 0;//鏌ヨ鏌愬ぉ鍏ュ簱浜嗗灏戝彂鍔ㄦ満
- int count_In_EmptySalver = 0;//鏌ヨ鏌愬ぉ鍏ュ簱浜嗗灏� 绌烘墭鐩�
- int count_In_EmptySalver_TS = 0;//鏌ヨ鏌愬ぉ鍏ュ簱浜嗗灏� 绌烘墭鐩樻墭鏁�
-
- int count_Out_FDJ = 0;//鏌ヨ鏌愬ぉ鍑哄簱浜嗗灏戝彂鍔ㄦ満
- int count_Out_EmptySalver = 0;//鏌ヨ鏌愬ぉ鍑哄簱浜嗗灏� 绌烘墭鐩�
- int count_Out_EmptySalver_TS = 0;//鏌ヨ鏌愬ぉ鍑哄簱浜嗗灏� 绌烘墭鐩樻墭鏁�
-
- int count_ZY_EmptySalver = 0;//鏌ヨ鏌愬ぉ杞繍浜嗗灏� 绌烘墭鐩�
- int count_ZY_EmptySalver_TS = 0;//鏌ヨ鏌愬ぉ杞繍浜嗗灏� 绌烘墭鐩樻墭鏁�
-
//鏌愭鏃堕棿鐨勭粺璁�
var str_start = this.dateTimePicker_Start.Value.ToString("yyyy-MM-dd" + " " + "00:00:00");
var str_end = this.dateTimePicker_End.Value.ToString("yyyy-MM-dd" + " " + "23:59:59");
--
Gitblit v1.9.3