油量电量消耗不排除损耗

廖磊
1 parent 07ae3e61
Showing 6 changed files with 47 additions and 63 deletions
src/main/java/com/bsth/controller/oil/DlbController.java
src/main/java/com/bsth/controller/oil/YlbController.java
src/main/java/com/bsth/service/oil/impl/DlbServiceImpl.java
src/main/java/com/bsth/service/oil/impl/YlbServiceImpl.java
src/main/resources/static/pages/electricity/list/list.html
src/main/resources/static/pages/oil/list_ph.html
@@ -21,6 +21,7 @@ import com.bsth.controller.BaseController;
 import com.bsth.entity.oil.Dlb;
 import com.bsth.entity.oil.Ylb;
 import com.bsth.service.oil.DlbService;
+import com.bsth.util.Arith;
 import com.bsth.util.ReportUtils;
 import com.google.common.base.Splitter;
@@ -164,10 +165,10 @@ public class DlbController extends BaseController&lt;Dlb, Integer&gt;{
 			String shyy ="无";
 			if(y.getShyy()!=null){
 				shyy=y.getShyy();
-				 if(shyy.equals("1")){shyy="票务用油";}
-				 else if(shyy.equals("2")){shyy="保养用油";}
-				 else if(shyy.equals("3")){shyy="报废车用油";}
-				 else if(shyy.equals("4")){shyy="其它用油";}
+				 if(shyy.equals("1")){shyy="票务用电";}
+				 else if(shyy.equals("2")){shyy="保养用电";}
+				 else if(shyy.equals("3")){shyy="报废车用电";}
+				 else if(shyy.equals("4")){shyy="其它用电";}
 				 else if(shyy.equals("5")){shyy="人保部";}
 				 else if(shyy.equals("6")){shyy="车队";}
 				 else if(shyy.equals("7")){shyy="车间(高保)";}
@@ -180,6 +181,7 @@ public class DlbController extends BaseController&lt;Dlb, Integer&gt;{
 			m.put("zlc", y.getZlc()<=0?"0":y.getZlc());
 			m.put("rdlx", "");
 			m.put("bglyh", y.getBglyh());
+			m.put("zdh", Arith.add(y.getSh(), y.getHd()));
 			resList.add(m);
 		}
 		try {
@@ -27,6 +27,7 @@ import com.bsth.entity.oil.Ylb;
 import com.bsth.entity.sys.SysUser;
 import com.bsth.security.util.SecurityUtils;
 import com.bsth.service.oil.YlbService;
+import com.bsth.util.Arith;
 import com.bsth.util.ReportUtils;
 import com.google.common.base.Splitter;
@@ -273,6 +274,7 @@ public class YlbController extends BaseController&lt;Ylb, Integer&gt;{
 			m.put("sh", y.getSh()<=0?"0":y.getSh());
 			m.put("zlc", y.getZlc()<=0?"0":y.getZlc());
 			m.put("bglyh", y.getBglyh());
+			m.put("zyh", Arith.add(y.getSh(), y.getYh()));
 			resList.add(m);
 		}
 		try {
@@ -273,18 +273,18 @@ public class DlbServiceImpl extends BaseServiceImpl&lt;Dlb,Integer&gt; implements DlbS
 				}
 			}
-			Map<String, Double> shMap=new HashMap<String,Double>();
-			for (int i = 0; i < dlList.size(); i++) {
-				Dlb dlb=dlList.get(i);
-				String cl=dlb.getNbbm();
-				if(shMap.get(cl)==null){
-					shMap.put(cl, dlb.getSh());
-				}else{
-					double sh=shMap.get(cl);
-					shMap.remove(cl);
-					shMap.put(cl, Arith.add(sh, dlb.getSh()));
-				}
-			}
+//			Map<String, Double> shMap=new HashMap<String,Double>();
+//			for (int i = 0; i < dlList.size(); i++) {
+//				Dlb dlb=dlList.get(i);
+//				String cl=dlb.getNbbm();
+//				if(shMap.get(cl)==null){
+//					shMap.put(cl, dlb.getSh());
+//				}else{
+//					double sh=shMap.get(cl);
+//					shMap.remove(cl);
+//					shMap.put(cl, Arith.add(sh, dlb.getSh()));
+//				}
+//			}
 			List<Jdl> jdlList=jdlRepository.JdlList(rq);
 			String sxtj=map2.get("sxtj").toString();
 			if(sxtj.equals("0")){
@@ -357,13 +357,13 @@ public class DlbServiceImpl extends BaseServiceImpl&lt;Dlb,Integer&gt; implements DlbS
 								zjzl = Arith.add(zjzl,jdl.getJdl());
 							}
 						}
-						double clsh=0.0;
-						if(shMap.get(map_.get("clZbh").toString())==null){
-							clsh=0.0;
-						}else{
-							clsh=shMap.get(map_.get("clZbh").toString());
-						}
-						zjzl =Arith.sub(zjzl, clsh);
+//						double clsh=0.0;
+//						if(shMap.get(map_.get("clZbh").toString())==null){
+//							clsh=0.0;
+//						}else{
+//							clsh=shMap.get(map_.get("clZbh").toString());
+//						}
+//						zjzl =Arith.sub(zjzl, clsh);
 						Double nextJzyl = 0.0;
 						for (int i = 0; i < listpb.size(); i++) {
 							Map<String, Object> map = listpb.get(i);
@@ -465,7 +465,6 @@ public class DlbServiceImpl extends BaseServiceImpl&lt;Dlb,Integer&gt; implements DlbS
 								t.setJhsj(map.get("fcsj")==null?"":map.get("fcsj").toString());
 								t.setRq(sdf.parse(rq));
 								t.setLp(map.get("lpName").toString());
-								 t.setCdl(Arith.add(t.getCdl(), t.getSh()));
 								 if(!(t.getSsgsdm().equals("") || t.getFgsdm().equals(""))){
 									 if(type.equals("add")){
 										 t.setCreatetime(date);
@@ -528,16 +528,8 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 			List<Ylb> ylbList =new ArrayList<Ylb>();
 			List<Ylb> ylbLists =new ArrayList<Ylb>();
 			List<Ylb> iterator2=new ArrayList<Ylb>();
-//			if(xlbm.equals("")){
-				ylbLists=this.listOrderBy(rq,gsbm,fgsbm,xlbm,nbbm,"jcsx");
-//						repository.obtainYl(rq,gsbm,fgsbm,xlbm,nbbm,"jcsx");
-				iterator2=this.listOrderBy(rq,gsbm,fgsbm,xlbm,nbbm,"nbbm,jcsx");
-//						repository.obtainYl(rq,gsbm,fgsbm,xlbm,nbbm,"nbbm,jcsx");
-//			}else{
-//				ylbLists=repository.obtainYl_eq(rq,gsbm,fgsbm,xlbm,nbbm,"jcsx");
-//				iterator2=repository.obtainYl_eq(rq,gsbm,fgsbm,xlbm,nbbm,"nbbm,jcsx");
-//			}
-			
+			ylbLists=this.listOrderBy(rq,gsbm,fgsbm,xlbm,nbbm,"jcsx");
+			iterator2=this.listOrderBy(rq,gsbm,fgsbm,xlbm,nbbm,"nbbm,jcsx");
 			// 从排班表中计算出行驶的总里程
 			String sxtj=map.get("sxtj").toString();
@@ -594,7 +586,7 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 						zlc = Arith.add(zlc, Double.valueOf(sumList.get(j)[1].toString()));
 						zsh = Arith.add(zsh, Double.valueOf(sumList.get(j)[2].toString()));
 					}
-					jzl = Arith.sub(jzl, zsh);
+//					jzl = Arith.sub(jzl, zsh);
 					// 保留两位小数
 					DecimalFormat df = new DecimalFormat("#.00");
 					Double zyl = 0.0;
@@ -622,7 +614,8 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 								if(zlc>0 ){
 									 yh = Double.parseDouble(df.format(zyl * (t.getZlc() / zlc)));
 								}
-								nextJzyl =Arith.sub( Arith.add(Arith.sub(t.getJzl(),t.getSh()), t.getCzyl()),yh);
+								nextJzyl =Arith.sub( Arith.add(t.getJzl(), t.getCzyl()),yh);
+//								nextJzyl =Arith.sub( Arith.add(Arith.sub(t.getJzl(),t.getSh()), t.getCzyl()),yh);
 								//把进场油量的小数和整数分别取出
 //								int ylxs=(int) nextJzyl; 10.6--11  10.3--10
 								if(zlc>0 && t.getZlc()>0){
@@ -643,7 +636,8 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 								if(zlc>0){
 									yh= Double.parseDouble(df.format(zyl * (t.getZlc() / zlc)));
 								}
-								nextJzyl =Arith.sub( Arith.add(Arith.sub(t.getJzl(),t.getSh()),nextJzyl),yh);
+								nextJzyl =Arith.sub( Arith.add(t.getJzl(),nextJzyl),yh);
+//								nextJzyl =Arith.sub( Arith.add(Arith.sub(t.getJzl(),t.getSh()),nextJzyl),yh);
 								if(zlc>0 && t.getZlc()>0){
 									long l=0l;
 									double ylxs=0.0;
@@ -1159,26 +1153,11 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 			Integer id =jsonObject.getInteger("id");
 			String nbbm =jsonObject.getString("nbbm");
 			String rq=jsonObject.getString("rq");
-			double yh = Arith.sub(Arith.add(czyl, jzl), Arith.add(jzyl, sh));
+			double yh = Arith.sub(Arith.add(czyl, jzl),sh);
 			if(yh<0){
 				yh=0.0;
 			}
-			/*t.setJzyl(jzyl);
-			t.setSh(sh);
-			t.setShyy(shyy);
-			t.setNs(ns);
-			t.setRylx(rylx);
-			t.setId(jsonObject.getInteger("id"));*/
 			repository.ylbUpdate(id, czyl, jzyl, yh, sh, shyy, ns, rylx,yhlx);
-			/*for (int z = 0; z < cylList.size(); z++) {
-				Cyl cyl = cylList.get(z);
-				if (nbbm.equals(cyl.getNbbm())) {
-					cyl.setCyl(jzyl);
-					cyl.setUpdatetime(sdf.parse(rq));
-					break;
-				}
-				cylRepository.save(cyl);
-			}*/
 		}
 //		List<Map<String, Object>> list=(List<Map<String, Object>>) map.get("ylbList");
@@ -1232,12 +1211,12 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 				}
 //				jzl = Arith.sub(jzl, zsh);
 				//新的 损耗不等于 旧的损耗 总损耗从新算
-				if(Arith.sub(ylb.getSh(),sh )!=0){
+				/*if(Arith.sub(ylb.getSh(),sh )!=0){
 					zsh =Arith.add(Arith.sub(zsh, ylb.getSh()), sh);
 					jzl =Arith.sub(jzl, zsh);
 				}else{
 					jzl =Arith.sub(jzl, zsh);
-				}
+				}*/
 				map.put("nbbm_eq", nbbm_eq);
 				map.put("rq_eq", rq_eq);
@@ -1264,7 +1243,8 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 						if (zlc > 0 && t.getZlc() > 0) {
 							yh = Double.parseDouble(df.format(zyl * (t.getZlc() / zlc)));
 						}
-						nextJzyl =Arith.sub(Arith.add(t.getJzl(), t.getCzyl()), Arith.add(yh, t.getSh()));
+						nextJzyl =Arith.sub(Arith.add(t.getJzl(), t.getCzyl()), yh);
+//						nextJzyl =Arith.sub(Arith.add(t.getJzl(), t.getCzyl()), Arith.add(yh, t.getSh()));
 						if(zlc>0 && t.getZlc() > 0){
 							long l=Math.round(nextJzyl);
 							double ylxs=l*100/100;
@@ -1287,7 +1267,8 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 							if (t.getZlc() >= 0) {
 								yh= Double.parseDouble(df.format(zyl * (t.getZlc() / zlc)));
 							}
-							nextJzyl = Arith.sub(Arith.add(t.getJzl(), nextJzyl), Arith.add(yh, t.getSh()));
+//							nextJzyl = Arith.sub(Arith.add(t.getJzl(), nextJzyl), Arith.add(yh, t.getSh()));
+							nextJzyl = Arith.sub(Arith.add(t.getJzl(), nextJzyl), yh);
 							if(zlc>0 && t.getZlc() >0){
 								long l=0l;
 								double ylxs=0.0;
@@ -534,7 +534,7 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
             		$("#sumSh").html(returns.sh);
         		});
-            	 $('input').on('input propertychange',function(){
+            /* 	 $('input').on('input propertychange',function(){
                   	var id=$(this).data('id');
                   	var cdl =$('.in_carpark_cdl[data-id='+id+']', '#dl_oil_list').html();
              		if(cdl=="" || cdl ==null){
@@ -552,7 +552,7 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
              		}
              		$('.in_carpark_hd[data-id='+id+']', '#dl_oil_list').val(subValue);
-                  });
+                  }); */
             });
         }
@@ -327,7 +327,7 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
         //var id = 15;
         //$('.in_carpark_jzyl[data-id='+id+']', '#ll_oil_list')
-        $(".checkYl").on('click', function () {
+        $("#checkYl").on('click', function () {
             //console.log("核对加注量");
             if ($("#rq").val() != "") {
                 var params=getParamsList();
@@ -342,7 +342,7 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
         })
         //进场等于出场
-        $(".outAndIn").on('click', function () {
+        $("#outAndIn").on('click', function () {
            // console.log("进场油量等于出场油量");
             if ($("#rq").val() != "") {
                 var params=getParamsList();
@@ -726,7 +726,7 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
             			sh=0;
             		}
             		var addNum=accAdd(jzl,czyl);
-            		var subNum=accAdd(jzyl,sh);
+            		var subNum=jzyl;
             		var sub=numSubtr(addNum*1000,subNum*1000);
             		var subValue=0;
             		if(sub/1000>=0){
@@ -859,7 +859,7 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
         }
         //删除
-        $('#removeButton').on('click', function () {
+        $('.removeButton').on('click', function () {
         	var idArray = [];
         	var x=0;
         	$('input.icheck:checked').each(function(){