Commit d942ede2aaf093236151f0ec3fd20696847983c4

Authored by 廖磊
1 parent 48facf5b

电量表核对加注量

src/main/java/com/bsth/service/oil/impl/DlbServiceImpl.java
@@ -738,37 +738,23 @@ public class DlbServiceImpl extends BaseServiceImpl<Dlb,Integer> implements DlbS @@ -738,37 +738,23 @@ public class DlbServiceImpl extends BaseServiceImpl<Dlb,Integer> implements DlbS
738 Line line= BasicData.nbbm2LineMap.get(y1.getNbbm()); 738 Line line= BasicData.nbbm2LineMap.get(y1.getNbbm());
739 if(null !=line){ 739 if(null !=line){
740 t.setXlbm(line.getLineCode()); 740 t.setXlbm(line.getLineCode());
741 - }else{  
742 - t.setXlbm("");  
743 - }  
744 - boolean status=true;  
745 - for (int j = 0; j < ylListBe.size(); j++) {  
746 - Dlb b=ylListBe.get(j);  
747 - if(b.getNbbm().equals(y1.getNbbm())){  
748 - t.setCzcd(b.getJzcd());  
749 - status=false;  
750 - break;  
751 - }  
752 - }  
753 - /*if(status){  
754 - for (int j = 0; j < cylList.size(); j++) {  
755 - Cyl c=cylList.get(j);  
756 - if(c.getNbbm().equals(y1.getNbbm())){  
757 - t.setCzyl(c.getCyl());  
758 - cyl=c; 741 + boolean status=true;
  742 + for (int j = 0; j < ylListBe.size(); j++) {
  743 + Dlb b=ylListBe.get(j);
  744 + if(b.getNbbm().equals(y1.getNbbm())){
  745 + t.setCzcd(b.getJzcd());
759 status=false; 746 status=false;
760 break; 747 break;
761 } 748 }
762 } 749 }
763 - }*/  
764 - if(status){  
765 - t.setCzcd(0.0);  
766 - }  
767 -// double jzyl=Arith.add(t.getJzl(), t.getCzyl());  
768 - t.setJzcd(100.0);  
769 - t.setHd(0.0);  
770 - if(fgsdm.equals(fgsbm)){  
771 - repository.save(t); 750 + if(status){
  751 + t.setCzcd(0.0);
  752 + }
  753 + t.setJzcd(100.0);
  754 + t.setHd(0.0);
  755 + if(fgsdm.equals(fgsbm)){
  756 + repository.save(t);
  757 + }
772 } 758 }
773 } 759 }
774 } 760 }