From d1590eb05ab3ab6036aca6791c4fec45bca4d453 Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期三, 10 十月 2018 15:33:35 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whychdw@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/src/com/fgkj/services/BattInfServices.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/services/BattInfServices.java b/gx_tieta/src/com/fgkj/services/BattInfServices.java
index 32fd1b2..b81a4fd 100644
--- a/gx_tieta/src/com/fgkj/services/BattInfServices.java
+++ b/gx_tieta/src/com/fgkj/services/BattInfServices.java
@@ -833,11 +833,11 @@
sdata.setMon_num(j+1);
for (int z = 0; z < listr.size(); z++) {
BattInf_Rebuild brinf=(BattInf_Rebuild) listr.get(z);
- if((j+1)==brinf.getOld_monum()){
+ if((j+1)==brinf.getOld_monum()&&sdata.getBattGroupId()==brinf.getOld_battgroupid()){
sdata.setMon_num(-1);
break;
}
- if((j+1)==brinf.getNew_monum()){
+ if((j+1)==brinf.getNew_monum()&&sdata.getBattGroupId()==brinf.getNew_battgroupid()){
sdata.setNote(brinf.getOld_battproducer());
break;
}
@@ -872,7 +872,7 @@
b.setFbsDeviceIp_WG_old("192.168.0.1");
b.setStationName("");
b.setStationName1("");
- b.setStationName2("");
+ b.setStationName2("姝︽眽甯�");
b.setStationName9("");
b.setBattGroupName("");
b.setStationId("42070463");
--
Gitblit v1.9.1