From 4d751d70f50cac4451663744cbd804c5d3e4f7cf Mon Sep 17 00:00:00 2001
From: Administrator <1525436766@qq.com>
Date: 星期六, 22 一月 2022 11:40:53 +0800
Subject: [PATCH] V1.07  2022-01-22 	1. 测试状态不能切换电池组

---
 BattMonitor_FGCD-A059NT/src/com/dev/fgcd/comm/FGCD_SocketClient_Thread.java |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/BattMonitor_FGCD-A059NT/src/com/dev/fgcd/comm/FGCD_SocketClient_Thread.java b/BattMonitor_FGCD-A059NT/src/com/dev/fgcd/comm/FGCD_SocketClient_Thread.java
index 4e56ca3..4646ce7 100644
--- a/BattMonitor_FGCD-A059NT/src/com/dev/fgcd/comm/FGCD_SocketClient_Thread.java
+++ b/BattMonitor_FGCD-A059NT/src/com/dev/fgcd/comm/FGCD_SocketClient_Thread.java
@@ -263,11 +263,15 @@
 					if(FGCD_ComBase.CMD_SetNowBatt == m_StatAndParam.op_cmd) {
 						FGCD_BattTestParam tmp_set_pm = testParam.clone();
 						FGCD_SocketClient_Thread_SQL.queryFbs9100SetParamBydev_id(m_ConnPool, m_StatAndParam, tmp_set_pm);
-						logger.debug("dev_id:"+m_StatAndParam.dev_id+"\t切换电池组号:" + tmp_set_pm.groupCount);
+						if(FGCD_ComBase.WORK_STATE_STOPPED == sysState.dev_workstate) {
+							SocketComm(FGCD_ComBase.CMD_SETNOWWORKBATT, tmp_set_pm.groupCount);
+							isOnlineMode = true;
+							logger.debug("dev_id:"+m_StatAndParam.dev_id+"\t切换电池组号:" + tmp_set_pm.groupCount);
+						}else {
+							logger.debug("dev_id:"+m_StatAndParam.dev_id+"\t 设备正在工作无法,切换电池组号:" + tmp_set_pm.groupCount);						
+						}
 						//设置电池组号
-						SocketComm(FGCD_ComBase.CMD_SETNOWWORKBATT, tmp_set_pm.groupCount);
 						tmp_set_pm = null;
-						isOnlineMode = true;
 					}else if(FGCD_ComBase.CMD_StartShowPic == m_StatAndParam.op_cmd) {
 						//开始显示图片
 						SocketComm(FGCD_ComBase.CMD_STARTSHOWPIC, 1);						

--
Gitblit v1.9.1