油量管理

廖磊
1 parent 9044b857
Showing 9 changed files with 314 additions and 97 deletions
src/main/java/com/bsth/controller/oil/YlbController.java
src/main/java/com/bsth/repository/oil/YlbRepository.java
src/main/java/com/bsth/service/oil/YlbService.java
src/main/java/com/bsth/service/oil/impl/YlbServiceImpl.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/resources/static/pages/forms/mould/list.xls
src/main/resources/static/pages/oil/add.html
src/main/resources/static/pages/oil/list_ph.html
src/main/resources/static/pages/report/inoutstation.html
@@ -16,6 +16,7 @@ import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Sort;
 import org.springframework.data.domain.Sort.Direction;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -196,6 +197,17 @@ public class YlbController extends BaseController&lt;Ylb, Integer&gt;{
         return ylbList;
 	}
+	@RequestMapping(value = "/deleteIds", method = RequestMethod.POST)
+    public Map<String, Object> deleteIds(@RequestParam Map<String, Object> map) {
+		Map<String, Object> maps=new HashMap<String, Object>();
+        try {
+        	maps= yblService.deleteIds(map);
+		} catch (Exception e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+        return maps;
+    }
 	@RequestMapping(value="/oilListMonth")
 	public List<Ylb> oilListMonth(@RequestParam String line,@RequestParam String date){
 		return yblService.oilListMonth(line, date);
@@ -219,17 +231,7 @@ public class YlbController extends BaseController&lt;Ylb, Integer&gt;{
 				sdfSimple = new SimpleDateFormat("yyyyMMdd");
 		List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
 		ReportUtils ee = new ReportUtils();
-		String rq=map.get("rq").toString();
-		if(!(rq=="")){
-			SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
-			try {
-				map.put("rq_eq", sdfMonth.parse(rq));
-			} catch (ParseException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
-			}
-		}
-		List<Ylb> ylb= (List<Ylb>)yblService.list(map);
+		List<Ylb> ylb= yblService.listYlb(map);
 //		(new CustomerSpecs<Ylb>(map)).iterator();
 		List<Map<String, Object>>  resList = new ArrayList<Map<String, Object>>();
 		for (Ylb y : ylb) {
@@ -245,12 +247,28 @@ public class YlbController extends BaseController&lt;Ylb, Integer&gt;{
 			m.put("czyl", y.getCzyl());
 			m.put("jzyl", y.getJzyl());
 			m.put("yh", y.getYh());
-			m.put("rylx", y.getRylx());
+			String rylx="";
+			if(y.getRylx()!=null){
+				if(y.getRylx().equals("0")){rylx="0号柴油";}
+				if(y.getRylx().equals("1")){rylx="负10号柴油";}
+			}
+			m.put("rylx", rylx);
 			m.put("ns", y.getNs());
-			m.put("shyy", y.getShyy());
+			String shyy ="无";
+			if(y.getShyy()!=null){
+				 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="车间(高保)";}
+				 else if(shyy.equals("8")){shyy="车间(小修)";}
+				 else{shyy ="无";}
+			}
+			m.put("shyy", shyy);
 			m.put("sh", y.getSh());
 			m.put("zlc", y.getZlc());
-			m.put("yhlx", y.getYhlx());
 			m.put("bglyh", y.getBglyh());
 			resList.add(m);
 		}
@@ -258,7 +276,7 @@ public class YlbController extends BaseController&lt;Ylb, Integer&gt;{
 			listI.add(resList.iterator());
 			String path = this.getClass().getResource("/").getPath()+"static/pages/forms/";
 			ee.excelReplace(listI, new Object[] { map }, path+"mould/list.xls",
-				path+"export/进出场存油量" + sdfSimple.format(sdfMonth.parse(map.get("rq").toString())) + ".xls");
+				path+"export/"+map.get("rq").toString()+ "进出场存油量.xls");
 			} catch (Exception e) {
 				e.printStackTrace();
 			}	
@@ -76,6 +76,23 @@ public interface YlbRepository extends BaseRepository&lt;Ylb, Integer&gt;{
 	List<Object[]> checkNbmmNum(String rq, String gsbm,String fgsbm,String xlbm,String nbbm);
+	/**
+	 * 
+	 * @param nbbm
+	 * @param rq
+	 * @param xlbm
+	 * @return
+	 */
+	@Transactional
+	@Modifying
+	@Query(value="select nbbm,sum(jzl*100) as jzl ,sum(zlc*100) as zlc from bsth_c_ylb where to_days(?1)=to_days(rq) and "
+			+ " ssgsdm like %?2% "
+			+ " and fgsdm like %?3%"
+			+ " and xlbm like %?4%  and nbbm  like %?5% "
+			+ " group by nbbm,rq,ssgsdm,fgsdm,xlbm",nativeQuery=true)
+	List<Object[]> checkNbmmYl(String rq, String gsbm,String fgsbm,String xlbm,String nbbm);
+	
+	
 	@Query(value="select jzl,yh,sh from Ylb s "
 			+ " where to_days(?1)=to_days(s.rq)  "
 			+ " and s.ssgsdm like %?2% "
@@ -23,4 +23,6 @@ public interface YlbService extends BaseService&lt;Ylb, Integer&gt;{
 	List<Ylb> listYlb(Map<String, Object> map);
 	StringBuffer checkNbmmNum(String rq, String gsbm,String fgsbm,String xlbm,String nbbm,int lx);
+	Map<String, Object> deleteIds(Map<String, Object> map) throws Exception;
+	
 }
@@ -30,6 +30,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.bsth.common.ResponseCode;
 import com.bsth.data.BasicData;
 import com.bsth.entity.Cars;
+import com.bsth.entity.Line;
 import com.bsth.entity.oil.Cyl;
 import com.bsth.entity.oil.Ylb;
 import com.bsth.entity.oil.Ylxxb;
@@ -178,6 +179,7 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 						t.setFgsdm(map.get("bCompany")==null?"":map.get("bCompany").toString());
 						t.setJhsj(map.get("fcsj")==null?"":map.get("fcsj").toString());
 						t.setRq(sdf.parse(rq));
+						t.setCreatetime(dNow);
 						repository.save(t);
 			}
@@ -202,6 +204,7 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 	public Map<String, Object> obtain(Map<String, Object> map2) throws Exception{
 		Map<String, Object> newMap = new HashMap<String, Object>();
 		try {
+			Date date=new Date();
 			List<Cars> carsList = carsRepository.findCars();
 			Map<String, Boolean> carsMap = new HashMap<String, Boolean>();
 			for (int i = 0; i < carsList.size(); i++) {
@@ -312,12 +315,7 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 							jzl =Arith.add(jzl, ylxxb.getJzl());
 						}
 					}
-					if(map.get("clZbh").toString().equals("W0A-212")){
-						System.out.println();
-					}
-					if(map.get("clZbh").toString().equals("W0A-211")){
-						System.out.println();
-					}
+
 					t.setJzl(jzl);
 					t.setNbbm(map.get("clZbh").toString());
 					t.setJsy(map.get("jGh") == null ? "" : map.get("jGh").toString());
@@ -329,6 +327,7 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 					t.setFgsdm(map.get("bCompany") == null ? "" : map.get("bCompany").toString());
 					t.setJhsj(map.get("fcsj")==null?"":map.get("fcsj").toString());
 					t.setRq(sdf.parse(rq));
+					t.setCreatetime(date);
 					 if(type.equals("add")){
 						 addList.add(t); 
 					 }else{
@@ -385,8 +384,6 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 			nbbm=map.get("nbbm_eq").toString();
 		}
-		List<Cyl> cylListAdd=new ArrayList<Cyl>();
-		Map<String, Object> cylMapAdd=new HashMap<String,Object>();
 		Map<String, Object> newMap=new HashMap<String,Object>();
 		Map<String, Object> map2=new HashMap<String,Object>();
 		try {
@@ -456,7 +453,10 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 								nextJzyl=ylxs;
 							} else {
 								t.setCzyl(nextJzyl);
-								Double yh = Double.parseDouble(df.format(zyl * (t.getZlc() / zlc)));
+								Double yh=0.0;
+								if(zlc>0){
+									yh= Double.parseDouble(df.format(zyl * (t.getZlc() / zlc)));
+								}
 								nextJzyl =Arith.sub( Arith.add(t.getJzl(),nextJzyl),yh);
 								long l=Math.round(nextJzyl);
 								double ylxs=l*100/100;
@@ -466,16 +466,21 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 								t.setJzyl(ylxs);
 								nextJzyl= ylxs;
 							}
-						
 							repository.save(t);
+							for (int z = 0; z < cylList.size(); z++) {
+								Cyl cyl = cylList.get(z);
+								if (t.getNbbm().equals(cyl.getNbbm())) {
+									cyl.setCyl(t.getJzyl());
+									cyl.setUpdatetime(t.getRq());
+									break;
+								}
+								cylRepository.save(cyl);
+							}
 						}
 						map2.put("status", ResponseCode.SUCCESS);
 					}
 				}
 			}
-			for (int i = 0; i < cylListAdd.size(); i++) {
-				cylRepository.save(cylListAdd.get(i));
-			}
 		} catch (Exception e) {
 			map2.put("status", ResponseCode.ERROR);
 			logger.error("save erro.", e);
@@ -647,9 +652,17 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 //			xlbm=map.get("xlbm_like").toString();
 //		}
 		// TODO Auto-generated method stub
+		
+		List<Cars> carsList = carsRepository.findCars();
+		Map<String, String> carsMap = new HashMap<String, String>();
+		for (int i = 0; i < carsList.size(); i++) {
+			Cars c = carsList.get(i);
+			carsMap.put(c.getInsideCode(), c.getBrancheCompanyCode()==null?"":c.getBrancheCompanyCode());
+		}
+		
 		try{
 			//获取车辆存油信息
-			List<Cyl> cylList=cylRepository.findAll(new CustomerSpecs<Cyl>(newMap));
+			
 			String rq=map.get("rq").toString();
 			String xlbm="";
 			if(map.get("xlbm_like")!=null){
@@ -667,6 +680,8 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 			if(map.get("nbbm_eq")!=null){
 				nbbm=map.get("nbbm_eq").toString();
 			}
+			List<Ylb> ylListBe=repository.obtainYlbefore(rq, gsbm, fgsbm, xlbm, nbbm);
+			List<Cyl> cylList=cylRepository.obtainCyl(nbbm, gsbm);
 			List<Ylb> ylbList=repository.obtainYl(rq,gsbm,fgsbm,xlbm,nbbm,"nbbm");
 			List<Ylxxb> ylxxbList=ylxxbRepository.obtainYlxx(rq,0,gsbm);
 			for (int i = 0; i < ylxxbList.size(); i++) {
@@ -681,14 +696,49 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 				}
 				if(fage){
+					Cyl cyl=null;
 					Ylb t=new Ylb();
 					t.setNbbm(y1.getNbbm());
 					t.setRq(y1.getYyrq());
 					t.setJsy(y1.getJsy());
 					t.setJzl(y1.getJzl());
 					t.setSsgsdm(y1.getGsdm());
-					t.setXlbm(xlbm);
+					t.setFgsdm(carsMap.get(y1.getNbbm()));
+					Line line= BasicData.nbbm2LineMap.get(y1.getNbbm());
+					if(null !=line)
+					t.setXlbm(line.getLineCode());
+					t.setJcsx(1);
+					boolean status=true;
+					for (int j = 0; j < ylListBe.size(); j++) {
+						Ylb b=ylListBe.get(j);
+						if(b.getNbbm().equals(y1.getNbbm())){
+							t.setCzyl(b.getJzyl());
+							status=false;
+							break;
+						}
+					}
+					if(status){
+						for (int j = 0; j < cylList.size(); j++) {
+							Cyl c=cylList.get(j);
+							if(c.getNbbm().equals(y1.getNbbm())){
+								t.setCzyl(c.getCyl());
+								cyl=c;
+								status=false;
+								break;
+							}
+						}
+					}
+					if(status){
+						t.setCzyl(0.0);
+					}
+//					double jzyl=Arith.add(t.getJzl(), t.getCzyl());
+					t.setJzyl(Arith.add(t.getJzl(), t.getCzyl()));
+					t.setYh(0.0);
 					repository.save(t);
+					if(null!=cyl){
+						cyl.setCyl(Arith.add(t.getJzl(), t.getCzyl()));
+						cylRepository.save(cyl);
+					}
 				}
 			}
 			newMap.put("status", ResponseCode.SUCCESS);
@@ -862,23 +912,52 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 					listYlb=repository.listYlb(rq, gsbm, fgsbm, xlbm, stringList);
 				}
 			}else{
-				List<Object[]> objectLists=repository.checkNbmmNum(rq, gsbm, fgsbm, xlbm,nbbm);
-				for (int i = 0; i < objectLists.size(); i++) {
-					String clbm=objectLists.get(i)[0].toString();
-					int cs=Integer.parseInt(objectLists.get(i)[1].toString());
-					//一车一单
-					if(sxtj.equals("1")){
-						if(cs==1){
+				List<Object[]> objectLists;
+				if(sxtj.equals("3")){
+					//有加油没里程
+					objectLists=repository.checkNbmmYl(rq, gsbm, fgsbm, xlbm, nbbm);
+					for (int i = 0; i < objectLists.size(); i++) {
+						String clbm=objectLists.get(i)[0].toString();
+						double jzl=Double.parseDouble(objectLists.get(i)[1].toString());
+						double zlc=Double.parseDouble(objectLists.get(i)[2].toString());
+						if(jzl>0 && zlc<=0){
 							stringList.add(clbm);
 						}
-					}	
-					//一车多单
-					if(sxtj.equals("2")){
-						if(cs>1){
+						
+					}
+					
+				}else if(sxtj.equals("4")){
+					//有里程没加油
+					objectLists=repository.checkNbmmYl(rq, gsbm, fgsbm, xlbm, nbbm);
+					for (int i = 0; i < objectLists.size(); i++) {
+						String clbm=objectLists.get(i)[0].toString();
+						double jzl=Double.parseDouble(objectLists.get(i)[1].toString());
+						double zlc=Double.parseDouble(objectLists.get(i)[2].toString());
+						if(zlc>0 && jzl<=0){
 							stringList.add(clbm);
 						}
+						
+					}
+				}else{
+					objectLists=repository.checkNbmmNum(rq, gsbm, fgsbm, xlbm,nbbm);
+					for (int i = 0; i < objectLists.size(); i++) {
+						String clbm=objectLists.get(i)[0].toString();
+						int cs=Integer.parseInt(objectLists.get(i)[1].toString());
+						//一车一单
+						if(sxtj.equals("1")){
+							if(cs==1){
+								stringList.add(clbm);
+							}
+						}	
+						//一车多单
+						if(sxtj.equals("2")){
+							if(cs>1){
+								stringList.add(clbm);
+							}
+						}
 					}
 				}
+				
 				if(stringList.size()>0){
 					listYlb=repository.listYlb(rq, gsbm, fgsbm, xlbm, stringList);
 				}
@@ -894,10 +973,12 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 		// TODO Auto-generated method stub
 		Map<String, Object> newMap=new HashMap<String,Object>();
 		try{
+		SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
 		String json =StringEscapeUtils.unescapeHtml4(map.get("ylbList").toString());
 		JSONArray jsonArray=JSONArray.parseArray(json);
 		JSONObject jsonObject;
-		
+		// 获取车辆存油信息
+		List<Cyl> cylList = cylRepository.obtainCyl("","");
 		for (int i = 0; i < jsonArray.size(); i++) {
 //			Ylb t=new Ylb();
 			jsonObject=jsonArray.getJSONObject(i);
@@ -910,6 +991,8 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 			String rylx =jsonObject.getString("rylx");
 			int yhlx =jsonObject.getIntValue("yhlx");
 			Integer id =jsonObject.getInteger("id");
+			String nbbm =jsonObject.getString("nbbm");
+			String rq=jsonObject.getString("rq");
 			double yh = Arith.sub(Arith.add(czyl, jzl), jzyl);
 			/*t.setJzyl(jzyl);
 			t.setSh(sh);
@@ -918,6 +1001,15 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 			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");
@@ -986,8 +1078,6 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 				Double zyl = 0.0;
 				Double nextJzyl = 0.0;
 				// 车的，进，出油量及耗油
-				Map<String, Object> cylMapAdd=new HashMap<String,Object>();
-				List<Cyl> cylListAdd=new ArrayList<Cyl>();
 				for (int i = 0; i < iterator2.size(); i++) {
 					Ylb t = iterator2.get(i);
 					if (t.getJcsx() == 1) {
@@ -1029,9 +1119,15 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 							nextJzyl=ylxs;
 					}
 					repository.save(t);
-				}
-				for (int i = 0; i < cylListAdd.size(); i++) {
-					cylRepository.save(cylListAdd.get(i));
+					for (int z = 0; z < cylList.size(); z++) {
+						Cyl cyl = cylList.get(z);
+						if (t.getNbbm().equals(cyl.getNbbm())) {
+							cyl.setCyl(t.getJzyl());
+							cyl.setUpdatetime(t.getRq());
+							break;
+						}
+						cylRepository.save(cyl);
+					}
 				}
 				newMap.put("status", ResponseCode.SUCCESS);
 			}
@@ -1052,9 +1148,9 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 		String jsy =map.get("jsy").toString();
 		String xlbm=map.get("xlbm").toString();
 		List<Ylb> list= repository.checkYlb(rq, nbbm, jsy,xlbm,"nbbm");
-		String type="";
+		String type="1";
 		if(list.size()>0){
-			type="cunzai";
+			type="0";
 		}
 		return type;
 	}
@@ -1070,17 +1166,51 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 		String jhsj=t.getJhsj();
 		String jsy=t.getJsy();
 		String nbbm=t.getNbbm();
-		List<Ylb> list=repository.checkYlb(rq, nbbm, jsy, xlbm,"jhsj");
+		t.setCreatetime(new Date());
+		String[] jhsjStr = jhsj.split(":");
+		long fcsjL= Long.parseLong(jhsjStr[0])*60+Long.parseLong(jhsjStr[1]);
+		List<Ylb> list=repository.obtainYl(rq, gsdm, fgsdm, xlbm, nbbm, "jhsj");
+		int jcsx=1;
 		if(list.size()>0){
 			for (int i = 0; i < list.size(); i++) {
 				Ylb y=list.get(i);
-				String jhsj2=y.getJhsj();
+				String[] fcsjStr = y.getJhsj().split(":");
+				long fcsj=Long.parseLong(fcsjStr[0])*60+Long.parseLong(fcsjStr[1]);
+				if(fcsjL>fcsj){
+					jcsx=jcsx+y.getJcsx();
+				}else{
+					y.setJcsx(y.getJcsx()+1);
+					repository.save(y);
+				}
 			}
-		}else{
-			t.setJcsx(1);
+			
 		}
+		t.setJcsx(jcsx);
+		repository.save(t);
 		map.put("status", ResponseCode.SUCCESS);
         map.put("t", t);
-		return null;
+		return map;
+	}
+	@Transactional  
+	@Override
+	public Map<String, Object> deleteIds(Map<String, Object> map) throws Exception{
+		// TODO Auto-generated method stub
+		Map<String, Object> maps = new HashMap<>();
+		try{
+		String json =StringEscapeUtils.unescapeHtml4(map.get("ids").toString());
+		JSONArray jsonArray=JSONArray.parseArray(json);
+		JSONObject jsonObject;
+		for (int x = 0; x < jsonArray.size(); x++) {
+			jsonObject=jsonArray.getJSONObject(x);
+			Integer id =jsonObject.getInteger("id");
+			repository.delete(id);
+		}
+		maps.put("status", ResponseCode.SUCCESS);
+		} catch (Exception e) {
+			maps.put("status", ResponseCode.ERROR);
+			logger.error("save erro.", e);
+			throw e; 
+		}
+		return maps;
 	}
 }
@@ -89,6 +89,9 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
     @Autowired
     SectionRouteService sectionRouteService;
+    
+    @Autowired
+    CulateMileageService culateMieageService;
 	/*@Autowired
     BorrowCenter borrowCenter;*/
@@ -3045,12 +3048,13 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             String jName = yesterdayDataList.get(x).get("jGh").toString();
             String clZbh = yesterdayDataList.get(x).get("clZbh").toString();
-            double jhlc = 0, yygl = 0, ksgl = 0, tempJhlc = 0, jcclc = 0;
+//            double jhlc = 0, yygl = 0, ksgl = 0, tempJhlc = 0, jcclc = 0;
             double addMileage = 0, remMileage = 0;
             Map<String, Object> map = new HashMap<String, Object>();
             boolean fage = true;
             String company="";
             String bCompany="";
+            List<ScheduleRealInfo> listS=new ArrayList<ScheduleRealInfo>();
             for (ScheduleRealInfo scheduleRealInfo : lists) {
             	if(scheduleRealInfo.getjGh().equals(jName) && scheduleRealInfo.getClZbh().equals(clZbh)){
 	                if (fage) {
@@ -3059,7 +3063,9 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 	                	bCompany=scheduleRealInfo.getFgsBm();
 	                    fage = false;
 	                }
-	                if (scheduleRealInfo != null) {
+	                listS.add(scheduleRealInfo);
+	                
+	               /* if (scheduleRealInfo != null) {
 	                    //计划里程（主任务过滤掉临加班次），
 	                    //烂班里程（主任务烂班），
 	                    //临加里程（主任务临加），
@@ -3118,16 +3124,22 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 	                            }
 	                        }
 	                    }
-	                }
+	                }*/
 	            }
             }
+            
             yesterdayDataList.get(x).put("company", company);
             yesterdayDataList.get(x).put("bCompany", bCompany);
-            Double zgl=Arith.add(yygl,ksgl);
-            yesterdayDataList.get(x).put("totalKilometers", Arith.add(zgl, jcclc));
+//            Double zgl=Arith.add(yygl,ksgl);
+            Double ljgl=culateMieageService.culateLjgl(listS);
+            Double sjgl=culateMieageService.culateSjgl(listS);
+            Double ksgl=culateMieageService.culateKsgl(listS);
+            Double jccgl=culateMieageService.culateJccgl(listS);
+            Double zyygl=Arith.add(sjgl, ljgl);
+            Double zksgl=Arith.add(ksgl, jccgl);
+            yesterdayDataList.get(x).put("totalKilometers", Arith.add(zyygl, zksgl));
         }
-        System.out.println();
         //增加顺序号
         for (int i = 0; i < yesterdayDataList.size(); i++) {
             if (i == 0) {
@@ -20,10 +20,12 @@
 	</div>
 	<div class="portlet-body form">
 		<form action="/addYlb" class="form-horizontal" id="ylb_add_form" >
+		
 		<div class="alert alert-danger display-hide">
 			<button class="close" data-close="alert"></button>
 			您的输入有误，请检查下面的输入项
 		</div>
+			<input type="hidden" value="0" name="yhlx" />
 			<div class="form-body">
 				<div class="form-group">
 					<label class="col-md-3 control-label">公司</label>
@@ -66,81 +68,102 @@
 					<label class="col-md-3 control-label">驾驶员</label>
 					<div class="col-md-4">
 							<select  class="form-control" name="jsy" id="jsy"> </select>
-							<input type="hidden" name="ssgsdm" id="ssgsdm" />
 					</div>
 				</div>
 				<div class="form-group">
 					<label class="col-md-3 control-label">出场里程</label>
 					<div class="col-md-4">
-							<input type="text" class="form-control" name="czlc" >
+							<input type="text" class="form-control" name="czlc" onkeyup="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')"  
+            onafterpaste="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')">
 					</div>
 				</div>
 				<div class="form-group">
 					<label class="col-md-3 control-label">出场油量</label>
 					<div class="col-md-4">
-							<input type="text" class="form-control" name="czyl" >
+							<input type="text" class="form-control" name="czyl" onkeyup="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')"  
+            onafterpaste="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')">
 					</div>
 				</div>
 				<div class="form-group">
 					<label class="col-md-3 control-label">加油量</label>
 					<div class="col-md-4">
-							<input type="text" class="form-control" name="jzl" >
+							<input type="text" class="form-control" name="jzl" onkeyup="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')"  
+            onafterpaste="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')">
 					</div>
 				</div>
 				<div class="form-group">
 					<label class="col-md-3 control-label">进场油量</label>
 					<div class="col-md-4">
-							<input type="text" class="form-control" name="jzyl" >
+							<input type="text" class="form-control" name="jzyl" onkeyup="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')"  
+            onafterpaste="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')">
 					</div>
 				</div>
 				<div class="form-group">
 					<label class="col-md-3 control-label">油耗</label>
 					<div class="col-md-4">
-							<input type="text" class="form-control" name="yh" >
+							<input type="text" class="form-control" name="yh" onkeyup="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')"  
+            onafterpaste="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')">
 					</div>
 				</div>
 				<div class="form-group">
 					<label class="col-md-3 control-label">燃油类型</label>
 					<div class="col-md-4">
-							<input type="text" class="form-control" name="rylx" >
+							<select name="rylx" class="form-control">
+								<option value='0'>0号柴油</option> 
+								<option value='1'>负10号柴油</option> 
+							</select>
 					</div>
 				</div>
 				<div class="form-group">
 					<label class="col-md-3 control-label">尿素</label>
 					<div class="col-md-4">
-							<input type="text" class="form-control" name="ns" >
+							<input type="text" class="form-control" name="ns" onkeyup="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')"  
+            onafterpaste="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')">
 					</div>
 				</div>
 				<div class="form-group">
 					<label class="col-md-3 control-label">进场里程</label>
 					<div class="col-md-4">
-							<input type="text" class="form-control" name="jzlc" >
+							<input type="text" class="form-control" name="jzlc" onkeyup="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')"  
+            onafterpaste="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')">
 					</div>
 				</div>
 				<div class="form-group">
 					<label class="col-md-3 control-label">损耗原因</label>
 					<div class="col-md-4">
-							<input type="text" class="form-control" name="shyy" >
+							<select  class="form-control" name="shyy">
+								<option value='0'>请选择</option> 
+								<option value='1'>票务用油</option> 
+								<option value='2'>保养用油</option> 
+								<option value='3'>报废车用油</option> 
+								<option value='4'>其它用油</option> 
+								<option value='5'>人保部</option> 
+								<option value='6'>车队</option> 
+								<option value='7'>车间(高保)</option> 
+								<option value='8'>车间(小修)</option> 
+							</select>
 					</div>
 				</div>
 				<div class="form-group">
 					<label class="col-md-3 control-label">损耗油量</label>
 					<div class="col-md-4">
-							<input type="text" class="form-control" name="sh" >
+							<input type="text" class="form-control" name="sh" onkeyup="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')"  
+            onafterpaste="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')">
 					</div>
 				</div>
 				<div class="form-group">
 					<label class="col-md-3 control-label">行驶总里程</label>
 					<div class="col-md-4">
-							<input type="text" class="form-control" name="zlc" >
+							<input type="text" class="form-control" name="zlc" onkeyup="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')"  
+            onafterpaste="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')">
 					</div>
 				</div>
@@ -165,10 +188,8 @@
 	var xlList;
 	$.get('/report/lineList',function(result){
 		xlList=result;
-		
 		$.get('/user/companyData', function(result){
 			obj = result;
-			console.log(obj);
 			var options = '';
 			for(var i = 0; i < obj.length; i++){
 				options += '<option value="'+obj[i].companyCode+'">'+obj[i].companyName+'</option>';
@@ -291,7 +312,6 @@
 		escapeMarkup: function (markup) { return markup; },
 		minimumInputLength: 1,
 		templateSelection: function(repo){
-			$("#ssgsdm").val(repo.gs);
 			return repo.text;
 		},
 		language: {
@@ -369,17 +389,15 @@
 					map["jsy"]=jsy;
 					map["xlbm"]=xlbm;
 					//检查一下用户是否存在
-						$get('/ylb/checkYl', map, function(fage){
-							console.log(fage);
-						if(fage!=""){
-							layer.msg('该驾驶员当天已存在.');
-						}else{
-							$post('/ylb/saveYlb', params, function(){
-								layer.msg('添加信息成功.');
-								loadPage('list.html');
-							});
-						}
-						
+						$get('/ylb/checkJsy', map, function(fage){
+							if(fage=="0"){
+								layer.msg('该驾驶员当天已存在.');
+							}else{
+								$post('/ylb/saveYlb', params, function(){
+									layer.msg('添加信息成功.');
+									loadPage('list_ph.html');
+								});
+							}
 					});
 				}
 			});
@@ -136,6 +136,8 @@
 												<option value="0">全部</option>
 												<option value="1">一车一单</option>
 												<option value="2">一车多单</option>
+												<option value="3">有加油没里程</option>
+												<option value="4">有里程没加油</option>
 										   </select>
 									</div>
@@ -324,6 +326,7 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
         	$('input.icheck').each(function(){
         		var map = {};
         		var id=$(this).data('id');
+        		var nbbm =$('.in_carpark_nbbm[data-id='+id+']', '#ll_oil_list').html();
         		var jzl =$('.in_carpark_jzl[data-id='+id+']', '#ll_oil_list').html();
         		if(jzl=="" || jzl ==null){
         			jzl=0;
@@ -360,11 +363,12 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
                 map['ns']=ns;
                 map['rylx']=rylx;
                 map['yhlx']=yhlx;
+                map['nbbm']=nbbm;
+                map['rq']=$("#rq").val();
                 ylArray.push(map);
         	})
         	var params = {};
         	params['ylbList']=JSON.stringify(ylArray);
-        	console.log(JSON.stringify(ylArray));
         	 var i = layer.load(2);
         	  $post('/ylb/saveYlbList', params, function () {
              	layer.close(i);
@@ -708,14 +712,30 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
         //删除
         $('#removeButton').on('click', function () {
-        	var id = $('input.icheck:checked').data('id');
-	       	 if (typeof(id) == 'undefined') {
+        	var idArray = [];
+        	var x=0;
+        	$('input.icheck:checked').each(function(){
+        		x++;
+        		var map ={};
+        		var id=$(this).data('id');
+        		map['id']=id;
+        	    idArray.push(map);
+        	    
+        	})
+	     	var params = {};
+	     	params['ids']=JSON.stringify(idArray);
+	       	 if (x==0) {
 	       		 layer.msg("请选择要删除的数据");
 	       	 }else{
-	            removeConfirm('确定要删除选中的数据？', '/ylb/' + id, function () {
-	            	  var params=getParamsList();
-	            	  jsDoQuery(params, true);
-	            });
+	            if(confirm('确定要删除选中的数据？')) 
+	            { 
+	            	 var i = layer.load(2);
+	            	 $post('/ylb/deleteIds', params, function (result) {
+	            		 layer.close(i);
+	            		 var params=getParamsList();
+		            	  jsDoQuery(params, true);
+	                 });
+	            } 
 	       	 }
         });
@@ -817,7 +837,7 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
             if ($("#rq").val() != "") {
 				 var params=getParamsList();
                 $post('/ylb/listExport', params, function (result) {
-                    window.open("/downloadFile/download?fileName=进出场存油量" + moment($("#rq").val()).format("YYYYMMDD"));
+                    window.open("/downloadFile/download?fileName="+$("#rq").val()+"进出场存油量" );
                 });
             } else {
                 layer.msg('请选择日期.');
@@ -69,9 +69,9 @@
 						<div class="form-group" style="display: inline-block;margin-left: 15px;">
 							<input class="btn btn-default" type="button" id="query" value="查询"/>
 							<input class="btn btn-default" type="button" style="display: none;" id="query2" value="查询"/>
-							<input class="btn btn-default" type="button" id="export" value="导出"/>
-							<input class="btn btn-default" type="button" id="print" value="打印"/>
-							<input class="btn btn-default" type="button" id="exportMore" value="批量导出"/>
+<!-- 							<input class="btn btn-default" type="button" id="export" value="导出"/> -->
+<!-- 							<input class="btn btn-default" type="button" id="print" value="打印"/> -->
+<!-- 							<input class="btn btn-default" type="button" id="exportMore" value="批量导出"/> -->
 						</div>
 						</div>
 				</form>