配组

星伟

2018-10-10 9e1664cbb6c02f8a9bfd5ed6fd7087014d73b2d3

 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");