油量计算

廖磊
1 parent 3c3df9d7
Showing 4 changed files with 38 additions and 168 deletions
src/main/java/com/bsth/service/oil/impl/DlbServiceImpl.java
src/main/java/com/bsth/service/oil/impl/YlbServiceImpl.java
src/main/java/com/bsth/service/report/impl/ReportServiceImpl.java
src/main/resources/static/pages/oil/list_ph.html
@@ -128,7 +128,8 @@ public class DlbServiceImpl extends BaseServiceImpl&lt;Dlb,Integer&gt; implements DlbS
 					Dlb t1=dlList.get(k);
 					if(t1.getNbbm().equals(map.get("clZbh").toString())
 							&&t1.getJsy().equals(map.get("jGh").toString())
-							&&t1.getXlbm().equals(map.get("xlBm").toString()))
+							&&t1.getXlbm().equals(map.get("xlBm").toString())
+							&&t1.getLp().equals(map.get("lpName").toString()))
 					{
 						t=t1;
 						type="update";
@@ -194,6 +195,7 @@ public class DlbServiceImpl extends BaseServiceImpl&lt;Dlb,Integer&gt; implements DlbS
 					t.setSsgsdm(map.get("company")==null?"":map.get("company").toString());
 					t.setFgsdm(map.get("bCompany")==null?"":map.get("bCompany").toString());
 					t.setJhsj(map.get("fcsj")==null?"":map.get("fcsj").toString());
+					t.setLp(map.get("lpName").toString());
 					t.setRq(sdf.parse(rq));
 					t.setCreatetime(new Date());
 					/*if(type.equals("add")){
@@ -560,9 +562,15 @@ public class DlbServiceImpl extends BaseServiceImpl&lt;Dlb,Integer&gt; implements DlbS
 										long l=Math.round(nextJzyl);
 										double ylxs=l*100/100;
 										dh=Arith.add(dh, Arith.sub(nextJzyl,ylxs));
-										t.setHd(dh);
-										t.setCdl(dh);
-										nextJzyl=ylxs;
+										if(dh<0){
+											t.setHd(dh);
+											t.setCdl(dh);
+											nextJzyl=Arith.add(ylxs, dh);
+										}else{
+											t.setHd(dh);
+											t.setCdl(dh);
+											nextJzyl=ylxs;
+										}
 									}else{
 										t.setHd(0.0);
 										t.setCdl(0.0);
@@ -586,9 +594,15 @@ public class DlbServiceImpl extends BaseServiceImpl&lt;Dlb,Integer&gt; implements DlbS
 										}
 										dh=Arith.add(dh, Arith.sub(nextJzyl,ylxs));
-										t.setHd(dh);
-										t.setCdl(dh);
-										nextJzyl=ylxs;
+										if(dh<0){
+											t.setHd(dh);
+											t.setCdl(dh);
+											nextJzyl=Arith.add(ylxs, dh);
+										}else{
+											t.setHd(dh);
+											t.setCdl(dh);
+											nextJzyl=ylxs;
+										}
 									}else{
 										t.setHd(0.0);
 										t.setCdl(0.0);
@@ -128,7 +128,8 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 						Ylb t1=ylList.get(k);
 						if(t1.getNbbm().equals(map.get("clZbh").toString())
 								&&t1.getJsy().equals(map.get("jGh").toString())
-								&&t1.getXlbm().equals(map.get("xlBm").toString()))
+								&&t1.getXlbm().equals(map.get("xlBm").toString())
+								&&t1.getLp().equals(map.get("lpName").toString()))
 						{
 							t=t1;
 							type="update";
@@ -618,13 +619,13 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 								czyl = t.getCzyl();
 								zyl =jzl;
 								Double yh=0.0;
-								if(zlc>0){
+								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);
 								//把进场油量的小数和整数分别取出
 //								int ylxs=(int) nextJzyl; 10.6--11  10.3--10
-								if(zlc>0){
+								if(zlc>0 && t.getZlc()>0){
 									long l=Math.round(nextJzyl);
 									double ylxs=l*100/100;
 //									nextJzyl = Arith.add(nextJzyl,Arith.sub(nextJzyl,ylxs));
@@ -643,14 +644,12 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 									yh= Double.parseDouble(df.format(zyl * (t.getZlc() / zlc)));
 								}
 								nextJzyl =Arith.sub( Arith.add(Arith.sub(t.getJzl(),t.getSh()),nextJzyl),yh);
-								if(zlc>0){
+								if(zlc>0 && t.getZlc()>0){
 									long l=0l;
 									double ylxs=0.0;
 									if(j==iterator2.size()-1){
 										ylxs=czyl;
 									}else{
-//										l=Math.round(nextJzyl);
-//										ylxs=l*100/100;
 										if(iterator2.get(j+1).getNbbm().equals(t.getNbbm())){
 											l=Math.round(nextJzyl);
 											ylxs=l*100/100;
@@ -693,154 +692,6 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 		return map2;
 	}
-	/**
-	 * 拆分
-	 */
-	/*
-	@Transactional  
-	@Override
-	public Map<String, Object> sort(Map<String, Object> map) throws Exception{
-		// TODO Auto-generated method stub
-		Map<String, Object> newMap = new HashMap<String, Object>();
-		SimpleDateFormat sdf =new SimpleDateFormat("yyyy-MM-dd");
-		try {
-			// 获取车辆存油信息
-			List<Cyl> cylList = cylRepository.findAll(new CustomerSpecs<Cyl>(newMap));
-			int id = Integer.parseInt(map.get("id").toString());
-			// 最后存油量
-			Double yl = Double.parseDouble(map.get("jzyl").toString());
-			Double sh= Double.parseDouble(map.get("sh").toString());
-			String shyy=map.get("shyy").toString();
-			Ylb ylb = repository.findOne(id);
-			List<Cyl> cylListAdd=new ArrayList<Cyl>();
-			Map<String, Object> cylMapAdd=new HashMap<String,Object>();
-			String nbbm_eq = ylb.getNbbm();
-			Date rq_eq = ylb.getRq();
-			// 得到一天总的加油和里程（根据车，时间）
-			List<Object[]> sumList = repository.sumLcYl(nbbm_eq, rq_eq,ylb.getXlbm());
-			// 保存总的加油量
-			Double jzl = 0.0;
-			// 保存总的里程
-			Double zlc = 0.0;
-			//保存总的损耗
-			Double zsh = 0.0;
-			for (int j = 0; j < sumList.size(); j++) {
-				jzl = Arith.add(jzl, Double.valueOf(sumList.get(j)[0].toString()));
-				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);
-			
-			//新的 损耗不等于 旧的损耗 总损耗从新算
-			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);
-			List<Ylb> iterator2=repository.obtainYl(sdf.format(rq_eq),ylb.getSsgsdm(),ylb.getFgsdm(),ylb.getXlbm(),
-					ylb.getNbbm(),"jcsx");
-//			Iterator<Ylb> iterator = repository.findAll(new CustomerSpecs<Ylb>(map), new Sort(Direction.ASC, "jcsx"))
-//					.iterator();
-			// 根据jcyl排序1为该车当日第一个出场，出场油量为前一天的存油
-			// 保留两位小数
-			DecimalFormat df = new DecimalFormat("#.00");
-			Double zyl = 0.0;
-			Double nextJzyl = 0.0;
-			// 车的，进，出油量及耗油
-			for (int i = 0; i < iterator2.size(); i++) {
-				Ylb t = iterator2.get(i);
-				if (t.getJcsx() == 1) {
-					if(t.getId()==id){
-						t.setSh(sh);
-						t.setShyy(shyy);
-					}
-					Double jcyl = t.getCzyl();
-					zyl = Arith.sub(Arith.add(jcyl, jzl), yl);
-					Double yh = 0.0;
-					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()));
-					long l=Math.round(nextJzyl);
-					double ylxs=l*100/100;
-//					nextJzyl = Arith.add(nextJzyl,Arith.sub(nextJzyl,ylxs));
-					yh=Arith.add(yh, Arith.sub(ylxs,nextJzyl));
-					t.setJzyl(ylxs);
-					t.setYh(yh);
-					nextJzyl=ylxs;
-				} else {
-					if(t.getId()==id){
-						t.setSh(sh);
-						t.setShyy(shyy);
-					}
-						t.setCzyl(nextJzyl);
-						Double yh =0.0;
-						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()));
-						long l=Math.round(nextJzyl);
-						double ylxs=l*100/100;
-//						nextJzyl = Arith.add(nextJzyl,Arith.sub(nextJzyl,ylxs));
-						yh=Arith.add(yh, Arith.sub(ylxs,nextJzyl));
-						t.setJzyl(ylxs);
-						t.setYh(yh);
-						nextJzyl=ylxs;
-				}
-				repository.save(t);
-
-				// 设置存油量
-				Cyl cyl = null;
-				boolean fage = false;
-				for (int z = 0; z < cylList.size(); z++) {
-					cyl = cylList.get(z);
-					if (t.getNbbm().equals(cyl.getNbbm())) {
-						cyl.setCyl(t.getJzyl());
-						cyl.setUpdatetime(t.getRq());
-						fage = true;
-						break;
-					}
-				}
-				if (fage) {
-					cylRepository.save(cyl);
-				} else {
-					if(cylMapAdd.get(t.getNbbm())!=null){
-						for (int l = 0; l < cylListAdd.size(); l++) {
-							cyl=cylListAdd.get(l);
-							if(cyl.getNbbm().equals(t.getNbbm())){
-								cyl.setNbbm(t.getNbbm());
-								cyl.setCyl(t.getJzyl());
-								cyl.setGsdm(t.getSsgsdm());
-								cyl.setFgsdm(t.getFgsdm());
-								cyl.setUpdatetime(t.getRq());
-							}
-						}
-					}else{
-						cyl = new Cyl();
-						cyl.setNbbm(t.getNbbm());
-						cyl.setCyl(t.getJzyl());
-						cyl.setGsdm(t.getSsgsdm());
-						cyl.setFgsdm(t.getFgsdm());
-						cyl.setUpdatetime(t.getRq());
-						cylListAdd.add(cyl);
-					}
-				}
-
-				newMap.put("status", ResponseCode.SUCCESS);
-			}
-			for (int i = 0; i < cylListAdd.size(); i++) {
-				cylRepository.save(cylListAdd.get(i));
-			}
-		} catch (Exception e) {
-			newMap.put("status", ResponseCode.ERROR);
-			logger.error("save erro.", e);
-			throw e; 
-		}
-		return newMap;
-	}*/
 	/**
 	 * 核对，有加注没里程
@@ -1315,6 +1166,9 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 			String nbbm =jsonObject.getString("nbbm");
 			String rq=jsonObject.getString("rq");
 			double yh = Arith.sub(Arith.add(czyl, jzl), jzyl);
+			if(yh<0){
+				yh=0.0;
+			}
 			/*t.setJzyl(jzyl);
 			t.setSh(sh);
 			t.setShyy(shyy);
@@ -1417,10 +1271,10 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 							yh = Double.parseDouble(df.format(zyl * (t.getZlc() / zlc)));
 						}
 						nextJzyl =Arith.sub(Arith.add(t.getJzl(), t.getCzyl()), Arith.add(yh, t.getSh()));
-						if(zlc>0){
+						if(zlc>0 && t.getZlc() > 0){
 							long l=Math.round(nextJzyl);
 							double ylxs=l*100/100;
-//							nextJzyl = Arith.add(nextJzyl,Arith.sub(nextJzyl,ylxs));
+//								nextJzyl = Arith.add(nextJzyl,Arith.sub(nextJzyl,ylxs));
 							yh=Arith.add(yh, Arith.sub(nextJzyl,ylxs));
 							t.setYh(yh);
 							t.setJzyl(ylxs);
@@ -1436,11 +1290,11 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 						}
 							t.setCzyl(nextJzyl);
 							Double yh =0.0;
-							if (t.getZlc() != 0) {
+							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()));
-							if(zlc>0){
+							if(zlc>0 && t.getZlc() >0){
 								long l=0l;
 								double ylxs=0.0;
 								if(i==iterator2.size()-1){
@@ -1929,6 +1929,9 @@ public class ReportServiceImpl implements ReportService{
 		newMap.put("jhglzgf", culateService.culateJhgl_(sList,"zgf"));
 		newMap.put("jhglwgf", culateService.culateJhgl_(sList,"wgf"));
+		newMap.put("lbgl", culateService.culateLbgl(sList));
+		newMap.put("lbbc", culateService.culateLbbc(sList));
+		
 		newMap.put("sjbc", culateService.culateSjbc(lists,""));
 		newMap.put("sjbczgf", culateService.culateSjbc(lists,"zgf"));
 		newMap.put("sjbcwgf", culateService.culateSjbc(lists,"wgf"));
@@ -1936,8 +1939,7 @@ public class ReportServiceImpl implements ReportService{
 		newMap.put("sjglzgf", culateService.culateSjgl_(lists,"zgf"));
 		newMap.put("sjglwgf", culateService.culateSjgl_(lists,"wgf"));
-		newMap.put("lbgl", culateService.culateLbgl(lists));
-		newMap.put("lbbc", culateService.culateLbbc(lists));
+		
 		newMap.put("ljgl", culateService.culateLjgl(lists));
 		newMap.put("ljglzgf", culateService.culateLjgl_(lists,"zgf"));
 		newMap.put("ljglwgf", culateService.culateLjgl_(lists,"wgf"));
@@ -674,7 +674,7 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
             var l = layer.load(2);
             $get('/ylb/ylbList', params, function (data) {
-            	
+            	console.log(data);
             	for(var i=1;i<data.length;i++){  
         	        moveArray[i]=new Array();  
         	        for(var j=1;j<6;j++){