From c007fe5c53a88495130b6c6e5ec9b7fc9ad1c9e1 Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.33>
Date: 星期四, 11 十月 2018 16:09:27 +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..01818a9 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,12 +874,17 @@
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());
}
+ if((j+1)==brinf.getOld_monum()&&b.getBattGroupId()==brinf.getOld_battgroupid()){
+ b.setMonNum(-1);
+ break;
+ }
}
list_b.add(b);
}
--
Gitblit v1.9.1