From b22be61da316b63accf2722195ac3579cf764df8 Mon Sep 17 00:00:00 2001
From: xuli <xul@valueics.com>
Date: Thu, 16 Apr 2026 11:21:59 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9C=8B=E6=9D=BF=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 NFine.Application/SRM/WatchPanelApp.cs | 48 ++++++++++++++++++++++----
 1 file changed, 41 insertions(+), 7 deletions(-)

diff --git a/NFine.Application/SRM/WatchPanelApp.cs b/NFine.Application/SRM/WatchPanelApp.cs
index a5a1041..6d6e197 100644
--- a/NFine.Application/SRM/WatchPanelApp.cs
+++ b/NFine.Application/SRM/WatchPanelApp.cs
@@ -269,17 +269,51 @@ left join base_organization oo  with(nolock)  on oo.id=line.Org
         public DataTable GetList7()
         {
 
-
+            string ORGCode = ConfigurationManager.ConnectionStrings["ORGCode"].ConnectionString;
 
             List<DbParameter> parameter = new List<DbParameter>();
             string SqlText = @"
 
-                SELECT ZQTY,QTY,
-                case WHEN ZQTY=0 THEN 0 ELSE Convert(decimal(18,0),QTY/ZQTY*100)  end  EQPRATE
-                FROM (select  ISNULL((
-                 select count(1) from device_data   with(nolock)  where created_at>=CONVERT(varchar(10), GETDATE(), 21) + ' 00:00:00'),0) QTY,
-                ISNULL(  (select count(1) from devices  with(nolock) ),0) ZQTY
-                ) KKK
+         DECLARE @ZqTY INT = 1 
+DECLARE @MINTIME DECIMAL = 1 
+
+SELECT @ZqTY = CAST ( enumtext AS INT ) 
+FROM
+	SysEnumValue vv
+	LEFT JOIN SysWorkPoint kk ON kk.TenantId= vv.TenantId 
+WHERE
+	vv.EnumKey = 'PanelSet'  AND vv.EnumValue = '设备总数'  AND kk.erpcode= '" + ORGCode + @"' 
+	
+SELECT
+	@MINTIME = CAST ( enumtext AS DECIMAL ) 
+FROM
+	SysEnumValue vv
+	LEFT JOIN SysWorkPoint kk ON kk.TenantId= vv.TenantId 
+WHERE
+	EnumKey = 'PanelSet' 
+	AND EnumValue = '设备开机时间设定' 
+	AND kk.erpcode= '" + ORGCode + @"' 
+	
+	SELECT 	@ZqTY, QTY,
+CASE 
+	WHEN @ZqTY = 0 THEN
+	0 ELSE CONVERT ( DECIMAL ( 18, 1 ), QTY * 1.00 /@ZqTY * 100.00 ) 
+	END EQPRATE 
+FROM
+	(
+	SELECT COUNT 		( 1 ) Qty 
+	FROM
+		(
+		SELECT 	device_id 
+		FROM
+			( SELECT DISTINCT device_id, total_production 
+			FROM device_data WHERE created_at >= dateadd( MINUTE,- 1 *@MINTIME, GETDATE()) ) JJ 
+		GROUP BY
+			device_id 
+		HAVING
+			( COUNT ( 1 ) > 1 ) 
+		) PP 
+) KKK
  
                  ";