From 6d8e5d522d1ad012a0bba760af6fb0837318d4fc Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: 星期一, 04 一月 2021 10:17:04 +0800
Subject: [PATCH] 仓库入库、仓库领用不显示残存量,入库、领用、存放的状态如果智能柜给你传重量,你再显示重量,不给你传重量的参数,你就显示空 提出:秦老师

---
 src/main/java/com/nanometer/smartlab/service/SysWarningServiceImpl.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/nanometer/smartlab/service/SysWarningServiceImpl.java b/src/main/java/com/nanometer/smartlab/service/SysWarningServiceImpl.java
index 55bc3da..e593e8d 100644
--- a/src/main/java/com/nanometer/smartlab/service/SysWarningServiceImpl.java
+++ b/src/main/java/com/nanometer/smartlab/service/SysWarningServiceImpl.java
@@ -84,7 +84,7 @@
             params.put("id", selectedWarning.getId());
             //给大屏信息发送处理信息
             //页面只允许修改完成转台
-            if (StringUtils.isNotBlank(selectedWarning.getAlarmId())){
+            if (StringUtils.isNotBlank(selectedWarning.getAlarmId()) && StringUtils.isNotBlank(alarmUrl)){
                 JSONObject json=new JSONObject();
                 json.put("dataType", "data");
                     json.put("id", selectedWarning.getAlarmId());

--
Gitblit v1.9.2