From 6b72d58686e543bc7fda3fe12d65c81765d37f86 Mon Sep 17 00:00:00 2001
From: cjj <Administrator@192.168.10.9>
Date: 星期五, 19 十月 2018 11:09:03 +0800
Subject: [PATCH] "-"
---
gx_tieta/src/com/fgkj/services/BattInfServices.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/services/BattInfServices.java b/gx_tieta/src/com/fgkj/services/BattInfServices.java
index 3c6ac12..bd09022 100644
--- a/gx_tieta/src/com/fgkj/services/BattInfServices.java
+++ b/gx_tieta/src/com/fgkj/services/BattInfServices.java
@@ -830,7 +830,6 @@
Batttestdatastop sdata=new Batttestdatastop();
sdata.setBattGroupId(binf.getBattGroupId());
sdata.setNote(binf.getBattProducer());
- sdata.setStationid(binf.getStationId());
sdata.setMon_num(j+1);
for (int z = 0; z < listr.size(); z++) {
BattInf_Rebuild brinf=(BattInf_Rebuild) listr.get(z);
@@ -875,11 +874,16 @@
b.setBattGroupName(binf.getBattGroupName());
b.setMonVolStd(binf.getMonVolStd());
b.setMonCapStd(binf.getMonCapStd());
+ b.setStationId(binf.getStationId());
b.setMonNum(j+1);
for (int z = 0; z < listr.size(); z++) {
BattInf_Rebuild brinf=(BattInf_Rebuild) listr.get(z);
if((j+1)==brinf.getNew_monum()&&b.getBattGroupId()==brinf.getNew_battgroupid()){
b.setBattProducer(brinf.getOld_battproducer());
+ b.setNum(1);
+ }
+ if((j+1)==brinf.getOld_monum()&&b.getBattGroupId()==brinf.getOld_battgroupid()){
+ b.setNum(0);
}
}
list_b.add(b);
--
Gitblit v1.9.1