嘉定油电操作量

廖磊
1 parent 8f5618c6
Showing 8 changed files with 3242 additions and 193 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/DlbService.java
src/main/java/com/bsth/service/oil/YlbService.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_jd.html
src/main/resources/static/pages/oil/list_jd.html
@@ -97,6 +97,18 @@ public class DlbController extends BaseController&lt;Dlb, Integer&gt;{
 		return list;
 	}
+	@RequestMapping(value = "/obtainJd",method = RequestMethod.GET)
+	public Map<String, Object> obtainJd(@RequestParam Map<String, Object> map) throws Exception{
+		Map<String, Object> list=new HashMap<String, Object>();
+		try {
+			list = service.obtain(map);
+		} catch (Exception e) {
+			// TODO Auto-generated catch block
+			throw e;
+		}
+		return list;
+	}
+	
 	/**
 	 * 保存电量
 	 * @param map
@@ -72,6 +72,19 @@ public class YlbController extends BaseController&lt;Ylb, Integer&gt;{
 		return list;
 	}
+	@RequestMapping(value = "/obtainJd",method = RequestMethod.GET)
+	public Map<String, Object> obtainJd(@RequestParam Map<String, Object> map) throws Exception{
+		Map<String, Object> list =new HashMap<String, Object>();
+		try {
+			
+			list = ylbService.obtain(map);
+		} catch (Exception e) {
+			// TODO Auto-generated catch block
+			throw e;
+		}
+		System.out.println();
+		return list;
+	}
 	@RequestMapping(value = "/saveYlbList",method = RequestMethod.POST)
 	public Map<String, Object> saveYlbList(@RequestParam Map<String, Object> map){
@@ -322,5 +335,17 @@ public class YlbController extends BaseController&lt;Ylb, Integer&gt;{
 		return list;
 	}
+	@RequestMapping(value = "/updateHistoryJd",method = RequestMethod.POST)
+	public Map<String, Object> updateHistoryJd(@RequestParam Map<String, Object> map) throws Exception{
+		Map<String, Object> list =new HashMap<String, Object>();
+		try {
+			list = ylbService.updateHistory(map);
+		} catch (Exception e) {
+			// TODO Auto-generated catch block
+			throw e;
+		}
+		return list;
+	}
+	
 }
@@ -8,7 +8,8 @@ import com.bsth.service.BaseService;
 public interface DlbService extends BaseService<Dlb, Integer>{
 	Map<String, Object> obtain(Map<String, Object> map) throws Exception;
-	
+	Map<String, Object> obtainJd(Map<String, Object> map) throws Exception;
+
 	Map<String, Object> sort(Map<String, Object> map);
 	Map<String, Object> checkDl(Map<String, Object> map);
@@ -8,6 +8,8 @@ import com.bsth.service.BaseService;
 public interface YlbService extends BaseService<Ylb, Integer>{
 	Map<String, Object> obtain(Map<String, Object> map) throws Exception;
+	Map<String, Object> obtainJd(Map<String, Object> map) throws Exception;
+
 	Map<String, Object> saveYlbList(Map<String, Object> map) throws Exception;
 	Map<String, Object> saveYlb(Ylb t);
 	String obtainDsq() throws Exception;
@@ -28,7 +30,7 @@ public interface YlbService extends BaseService&lt;Ylb, Integer&gt;{
 	Map<String, Object> deleteIds(Map<String, Object> map) throws Exception;
 	Map<String, Object> updateHistory(Map<String, Object> map) throws Exception;
-	
+	Map<String, Object> updateHistoryJd(Map<String, Object> map) throws Exception;
 	Map<String, Object> update(Map<String, Object> map);
@@ -261,7 +261,7 @@ public class DlbServiceImpl extends BaseServiceImpl&lt;Dlb,Integer&gt; implements DlbS
 			// 当天DLB信息
 			List<Dlb> dlList = this.listOrderBy(rq,gsbm,fgsbm,"",nbbm,"nbbm");
 			// 当天YLXXB信息
-			List<Ylxxb> ylxxList = ylxxbRepository.obtainYlxx(rq, 0,gsbm);
+			List<Ylxxb> ylxxList = ylxxbRepository.obtainYlxx(rq, 1,gsbm);
 			// 从排班表中计算出行驶的总里程
 			List<Map<String, Object>> listpb =new ArrayList<Map<String, Object>>();
 			List<Map<String, Object>> listpbs=scheduleRealInfoService.yesterdayDataList("", rq, gsbm, fgsbm, "", nbbm);
@@ -528,6 +528,304 @@ public class DlbServiceImpl extends BaseServiceImpl&lt;Dlb,Integer&gt; implements DlbS
 		return newMap;
 	}
+	
+	
+	/**
+	 * 获取进存油信息
+	 * @Transactional 回滚事物
+	 */
+	@Transactional  
+	@Override
+	public Map<String, Object> obtainJd(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, Object> carsMap = new HashMap<String, Object>();
+			for (int i = 0; i < carsList.size(); i++) {
+				Cars c = carsList.get(i);
+				carsMap.put(c.getInsideCode(), c.getNyType());
+			}
+			String rq = map2.get("rq").toString();
+			String line = "";
+			if (map2.get("xlbm_like") != null) {
+				line = map2.get("xlbm_like").toString().trim();
+			}
+			String gsbm="";
+			if(map2.get("ssgsdm_like")!=null){
+				gsbm=map2.get("ssgsdm_like").toString();
+			}
+			String fgsbm="";
+			if(map2.get("fgsdm_like")!=null){
+				fgsbm=map2.get("fgsdm_like").toString();
+			}
+			String nbbm="";
+			if(map2.get("nbbm_eq")!=null){
+				nbbm=map2.get("nbbm_eq").toString();
+			}
+			SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+			// 保留两位小数
+			DecimalFormat df = new DecimalFormat("#.00");
+			// TODO Auto-generated method stub
+			// 当天DLB信息
+			List<Dlb> dlList = this.listOrderBy(rq,gsbm,fgsbm,"",nbbm,"nbbm");
+			// 当天YLXXB信息
+			List<Ylxxb> ylxxList = ylxxbRepository.obtainYlxx(rq, 1,gsbm);
+			// 从排班表中计算出行驶的总里程
+			List<Map<String, Object>> listpb =new ArrayList<Map<String, Object>>();
+			List<Map<String, Object>> listpbs=scheduleRealInfoService.yesterdayDataList("", rq, gsbm, fgsbm, "", nbbm);
+		    Map<String, Double> lcMap=new HashMap<String,Double>();
+			for (int i = 0; i < listpbs.size(); i++) {
+				String cl=listpbs.get(i).get("clZbh").toString();
+				Double lc= listpbs.get(i).get("totalKilometers") == null ? 0.0
+						: Double.parseDouble(listpbs.get(i).get("totalKilometers").toString());
+				if(lcMap.get(cl)==null){
+					lcMap.put(cl, lc);
+				}else{
+					double lc_=lcMap.get(cl);
+					lcMap.remove(cl);
+					lcMap.put(cl, Arith.add(lc, lc_));
+				}
+			}
+			
+			List<Jdl> jdlList=jdlRepository.JdlList(rq);
+			String sxtj=map2.get("sxtj").toString();
+			if(sxtj.equals("0")){
+				listpb=listpbs;
+			}else{
+				List<Object[]> objectLists=repository.checkNbmmNum(rq, gsbm, fgsbm, "",nbbm);
+				List<String> stringList=new ArrayList<String>();
+				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);
+						}
+					}
+				}
+				
+				for (int i = 0; i < stringList.size(); i++) {
+					String strNbbm=stringList.get(i);
+					for (int j = 0; j < listpbs.size(); j++) {
+						Map<String, Object> map = listpbs.get(j);
+						String mapNbbm=map.get("clZbh").toString();
+						if(strNbbm.equals(mapNbbm)){
+							listpb.add(map);
+						}
+					}
+				}
+			}
+			Map<String, Object> newMap_=new HashMap<String,Object>();
+			List<Dlb> addList = new ArrayList<Dlb>();
+			List<Dlb> updateList = new ArrayList<Dlb>();
+			Map<String, Object> cMap=new HashMap<String, Object>();
+			List<Map<String, Object>> listpb_=listpb;
+			Collections.sort(listpb,new NbbmJcsxMap());
+			for (int x = 0; x < listpb_.size(); x++) {
+				String type = "add";
+				boolean sfdc = false;
+				Map<String, Object> map_ = listpb_.get(x);
+				if (carsMap.get(map_.get("clZbh").toString()) != null) {
+					if(map_.get("clZbh").toString().equals("0")){
+						sfdc = false;
+					}
+				} else {
+					sfdc = false;
+				}
+				if (sfdc) {
+					if(newMap_.get(map_.get("clZbh").toString())==null){
+						newMap_.put(map_.get("clZbh").toString(), map_.get("clZbh").toString());
+						//车辆总里程
+						double zlc =lcMap.get(map_.get("clZbh").toString());
+						//车辆总加电量
+						double zjzl = 0.0;
+						for (int j = 0; j < ylxxList.size(); j++) {
+							Ylxxb ylxxb = ylxxList.get(j);
+							if (map_.get("clZbh").toString().equals(ylxxb.getNbbm())
+									&& map_.get("company").toString().equals(ylxxb.getGsdm())) {
+								zjzl = Arith.add(zjzl, ylxxb.getJzl());
+							}
+						}
+						for (int i = 0; i < jdlList.size(); i++) {
+							Jdl jdl=jdlList.get(i);
+							if(map_.get("clZbh").toString().equals(jdl.getNbbm()) 
+									&&map_.get("company").toString().equals(jdl.getGsBm())
+									&&map_.get("bCompany").toString().equals(jdl.getFgsBm())){
+								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 nextJzyl = 0.0;
+						for (int i = 0; i < listpb.size(); i++) {
+							Map<String, Object> map = listpb.get(i);
+							if(map_.get("clZbh").toString().equals(map.get("clZbh").toString())){
+								// 判断驾驶员驾驶的该车辆是否已经存入了（查出的结果集中日期是相同的，根据驾驶员、内部编号、线路编码判断）
+								Dlb t = new Dlb();
+								for (int k = 0; k < dlList.size(); k++) {
+									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())) {
+										if(t1.getLp()==null){
+											//同人同车同线路不同路牌的过滤  （考虑到历史数据）
+											if (cMap.get(map.get("clZbh").toString()+map.get("jGh").toString()+map.get("xlBm").toString())==null) {
+												t = t1;
+												type = "update";
+												cMap.put(map.get("clZbh").toString()+map.get("jGh").toString()+map.get("xlBm").toString(),
+														map.get("clZbh").toString());
+											}
+										}else{
+											if(t1.getLp().equals(map.get("lpName").toString())){
+												t = t1;
+												type = "update";
+											}
+											
+										}
+									}
+								}
+								Double lc= Double.parseDouble(map.get("totalKilometers").toString());
+								if(map.get("seqNumber").toString().equals("1")){
+									// 当日的第一个班次，出场油量等于前一天的最后一个班次的进场油量
+									Double dh=0.0;
+									if(zlc>0){
+										dh = Double.parseDouble(df.format(zjzl * (lc / zlc)));
+									}
+									nextJzyl =Arith.sub(zjzl,dh);
+									if(zlc>0){
+//										long l=Math.round(nextJzyl);
+										double ylxs=nextJzyl;
+										dh=Arith.add(dh, Arith.sub(nextJzyl,ylxs));
+										if(dh<0){
+											t.setHd(0.0);
+											t.setCdl(0.0);
+											nextJzyl=Arith.add(ylxs, dh);
+										}else{
+											t.setHd(dh);
+											t.setCdl(dh);
+											nextJzyl=ylxs;
+										}
+									}else{
+										t.setHd(0.0);
+										t.setCdl(0.0);
+									}
+								}else{
+									Double dh=0.0;
+									if(zlc>0){
+										dh = Double.parseDouble(df.format(zjzl * (lc / zlc)));
+									}
+									nextJzyl =Arith.sub( nextJzyl,dh);
+									if(zlc>0){
+//										long l=0l;
+										double ylxs=0.0;
+										if(i==listpb.size()-1){
+//											ylxs=czyl;
+										}else{
+											if(listpb.get(i+1).get("clZbh").toString().equals(map.get("clZbh").toString())){
+//												l=Math.round(nextJzyl);
+												ylxs=nextJzyl;
+											}
+											
+										}
+										dh=Arith.add(dh, Arith.sub(nextJzyl,ylxs));
+										if(dh<0){
+											t.setHd(0.0);
+											t.setCdl(0.0);
+											nextJzyl=Arith.add(ylxs, dh);
+										}else{
+											t.setHd(dh);
+											t.setCdl(dh);
+											nextJzyl=ylxs;
+										}
+									}else{
+										t.setHd(0.0);
+										t.setCdl(0.0);
+									}
+								}
+								t.setCzcd(100.0);
+								t.setJzcd(100.0);
+								t.setNbbm(map.get("clZbh").toString());
+								t.setJsy(map.get("jGh") == null ? "" : map.get("jGh").toString());
+								t.setZlc(map.get("totalKilometers") == null ? 0.0
+										: Double.parseDouble(map.get("totalKilometers").toString()));
+								t.setXlbm(map.get("xlBm") == null ? "" : map.get("xlBm").toString());
+								t.setJcsx(Integer.parseInt(map.get("seqNumber").toString()));
+								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.setRq(sdf.parse(rq));
+								t.setLp(map.get("lpName").toString());
+								t.setJname(map.get("jName").toString());
+								if (!(t.getSsgsdm().equals("") || t.getFgsdm().equals(""))) {
+									if (t.getHd() < 0) {
+										t.setHd(0.0);
+									}
+									if (t.getCdl() < 0) {
+										t.setCdl(0.0);
+									}
+									if (type.equals("add")) {
+										t.setCreatetime(date);
+										addList.add(t);
+									} else {
+										t.setUpdatetime(date);
+										updateList.add(t);
+									}
+								}
+								newMap.put("status", ResponseCode.SUCCESS);
+							}
+						}
+					}
+				}
+			}
+			if(addList.size()>0){ 
+				try {
+					new BatchSaveUtils<Dlb>().saveList2(addList, Dlb.class); 
+				} catch (Exception e) {
+					// TODO: handle exception
+					if(e.getMessage().indexOf("PK_DLB_UK")>0){
+						newMap.put("fage", "存在相同数据,数据已经过滤");
+						logger.info("获取:存在相同数据,数据已经过滤");
+					}
+				}
+				
+			}
+			
+			if(updateList.size()>0){
+				for (int i = 0; i < updateList.size(); i++) {
+					repository.save(updateList.get(i));
+				}
+			}
+			SysUser user = SecurityUtils.getCurrentUser();
+			Nylog nylog=new Nylog();
+			nylog.setCreatedate(new Date());
+			nylog.setCzmc("获取");
+			nylog.setNylx("电");
+			nylog.setUserid(user.getUserName());
+			nylog.setUsername(user.getName());
+			nylog.setCxtj(line+"-"+ date+"-"+gsbm+"-"+fgsbm);
+			nylogRepository.save(nylog);
+			newMap.put("status", ResponseCode.SUCCESS);
+		} catch (Exception e) {
+			// TODO Auto-generated catch block
+			newMap.put("status", ResponseCode.ERROR);
+			throw e;
+		}
+
+		return newMap;
+	}
 	/**
 	 * 拆分
 	 */
@@ -1081,7 +1379,7 @@ public class DlbServiceImpl extends BaseServiceImpl&lt;Dlb,Integer&gt; implements DlbS
 			}
 		}
 		List<Jdl> jdlList=jdlRepository.JdlList(date);
-		List<Ylxxb> ylxxList = ylxxbRepository.obtainYlxx(date, 0,gsdm);
+		List<Ylxxb> ylxxList = ylxxbRepository.obtainYlxx(date, 1,gsdm);
 		Map<String, Object> newMap_=new HashMap<String,Object>();
 		Map<String, Object> cMap=new HashMap<String, Object>();
 		List<Map<String, Object>> listpb_=listpbDc;
@@ -235,21 +235,23 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 		return result;
 	}
+	
+	
 	/**
 	 * 获取进存油信息
 	 * @Transactional 回滚事物
 	 */
 	@Transactional  
 	@Override
-	public Map<String, Object> obtain(Map<String, Object> map2) throws Exception{
+	public Map<String, Object> obtainJd(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>();
+			Map<String, Object> carsMap = new HashMap<String, Object>();
 			for (int i = 0; i < carsList.size(); i++) {
 				Cars c = carsList.get(i);
-				carsMap.put(c.getInsideCode(), c.getSfdc());
+				carsMap.put(c.getInsideCode(), c.getNyType());
 			}
 			String rq = map2.get("rq").toString();
 			String line = "";
@@ -331,7 +333,10 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 				boolean sfdc = true;
 				Map<String, Object> map = listpb.get(x);
 				if (carsMap.get(map.get("clZbh").toString()) != null) {
-					sfdc = carsMap.get(map.get("clZbh").toString());
+					if(map.get("clZbh").toString().equals("1")){
+						sfdc=true;
+					}
+//					sfdc = carsMap.get(map.get("clZbh").toString());
 				} else {
 					sfdc = true;
 				}
@@ -550,52 +555,61 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 	/**
-	 * 进场等于出场
+	 * 获取进存油信息
+	 * @Transactional 回滚事物
 	 */
 	@Transactional  
 	@Override
-	public Map<String, Object> outAndIn(Map<String, Object> map) throws Exception{
-		// TODO Auto-generated method stub
-		String xlbm="";
-		if(map.get("xlbm_like")!=null){
-			xlbm= map.get("xlbm_like").toString().trim();
-		}
-		String gsbm="";
-		if(map.get("ssgsdm_like")!=null){
-			gsbm=map.get("ssgsdm_like").toString();
-		}
-		String fgsbm="";
-		if(map.get("fgsdm_like")!=null){
-			fgsbm=map.get("fgsdm_like").toString();
-		}
-		String rq = map.get("rq").toString();
-		String nbbm="";
-		if(map.get("nbbm_eq")!=null){
-			nbbm=map.get("nbbm_eq").toString();
-		}
-		
-		Map<String, Object> newMap=new HashMap<String,Object>();
-		Map<String, Object> map2=new HashMap<String,Object>();
+	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++) {
+				Cars c = carsList.get(i);
+				carsMap.put(c.getInsideCode(), c.getSfdc());
+			}
+			String rq = map2.get("rq").toString();
+			String line = "";
+			if (map2.get("xlbm_like") != null) {
+				line = map2.get("xlbm_like").toString().trim();
+			}
+			String gsbm="";
+			if(map2.get("ssgsdm_like")!=null){
+				gsbm=map2.get("ssgsdm_like").toString();
+			}
+			String fgsbm="";
+			if(map2.get("fgsdm_like")!=null){
+				fgsbm=map2.get("fgsdm_like").toString();
+			}
+			String nbbm="";
+			if(map2.get("nbbm_eq")!=null){
+				nbbm=map2.get("nbbm_eq").toString();
+			}
 			SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+			// 保留两位小数
+			DecimalFormat df = new DecimalFormat("#.00");
+			// TODO Auto-generated method stub
+			// 当天YLB信息
+			List<Ylb> ylList = this.listOrderBy(rq,gsbm,fgsbm,"",nbbm,"nbbm");
+
+			// 当天YLXXB信息
+			List<Ylxxb> ylxxList = ylxxbRepository.obtainYlxx(rq, 0,gsbm);
+
+			// 前一天所有车辆最后进场班次信息
+			List<Ylb> ylListBe = this.listByRqJcsx(rq, gsbm, fgsbm, "", nbbm);
+			List<Cyl> clyList = cylRepository.obtainCyl(nbbm,gsbm);
-			map.put("rq_eq", sdf.parse(rq));
-//			List<Cyl> clyList = cylRepository.obtainCyl();
-			// 获取车辆存油信息
-			List<Cyl> cylList = cylRepository.obtainCyl(nbbm,gsbm);
-			// 指定日期YLB信息
-			List<Ylb> ylbList =new ArrayList<Ylb>();
-			List<Ylb> ylbLists =new ArrayList<Ylb>();
-			List<Ylb> iterator2=new ArrayList<Ylb>();
-			ylbLists=this.listOrderBy(rq,gsbm,fgsbm,xlbm,nbbm,"jcsx");
-			iterator2=this.listOrderBy(rq,gsbm,fgsbm,xlbm,nbbm,"nbbm,jcsx");
 			// 从排班表中计算出行驶的总里程
+			List<Map<String, Object>> listpb =new ArrayList<Map<String, Object>>();
+			List<Map<String, Object>> listpbs=scheduleRealInfoService.yesterdayDataList("", rq, gsbm, fgsbm, "", nbbm);
-			String sxtj=map.get("sxtj").toString();
+			String sxtj=map2.get("sxtj").toString();
 			if(sxtj.equals("0")){
-				ylbList=ylbLists;
+				listpb=listpbs;
 			}else{
-				List<Object[]> objectLists=repository.checkNbmmNum(rq, gsbm, fgsbm, xlbm,nbbm);
+				List<Object[]> objectLists=repository.checkNbmmNum(rq, gsbm, fgsbm, "",nbbm);
 				List<String> stringList=new ArrayList<String>();
 				for (int i = 0; i < objectLists.size(); i++) {
 					String clbm=objectLists.get(i)[0].toString();
@@ -616,194 +630,499 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 				for (int i = 0; i < stringList.size(); i++) {
 					String strNbbm=stringList.get(i);
-					for (int j = 0; j < ylbLists.size(); j++) {
-						Ylb y = ylbLists.get(j);
-						String mapNbbm=y.getNbbm();
+					for (int j = 0; j < listpbs.size(); j++) {
+						Map<String, Object> map = listpbs.get(j);
+						String mapNbbm=map.get("clZbh").toString();
 						if(strNbbm.equals(mapNbbm)){
-							ylbList.add(y);
+							listpb.add(map);
 						}
 					}
 				}
 			}
-			
-			for (int i=0;i<ylbList.size();i++) {
-				Ylb ylb = ylbList.get(i);
-				// 判断是否已经计算过
-				if (newMap.get("nbbm" + ylb.getNbbm()) == null) {
-					String nbbm_eq = ylb.getNbbm();
-					Date rq_eq = ylb.getRq();
-					// 得到一天总的加油和里程（根据车，时间）
-					List<Object[]> sumList = repository.sumLcYl(nbbm_eq, rq_eq,"",gsbm,fgsbm);
-					// 保存总的加油量
-					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);
-					// 保留两位小数
-					DecimalFormat df = new DecimalFormat("#.00");
-					Double zyl = 0.0;
-					Double nextJzyl = 0.0;
-					// 保存已经计算过的车辆，相同车辆编号的车不在计算
-					newMap.put("nbbm" + ylb.getNbbm(), ylb.getNbbm());
-					// 查询指定车辆，设置进、存、耗油量
-					map.remove("nbbm_eq");
-					map.put("nbbm_eq", ylb.getNbbm());
-					map.put("xlbm_like", ylb.getXlbm());
-//					Iterator<Ylb> iterator2 = repository
-//							.findAll(new CustomerSpecs<Ylb>(map), new Sort(Direction.ASC, "jcsx")).iterator();
-					double czyl=0.0;
-					for (int j = 0; j < iterator2.size(); j++) {
-						Ylb t = iterator2.get(j);
-						if(t.getNbbm().equals(ylb.getNbbm())){
-							if (t.getJcsx() == 1) {
-								// 进场等于出场的操作 既 最后进场存油量等于第一次的出场存油量
-//								Double yl = t.getCzyl();
-//								Double jcyl = t.getCzyl();
-								czyl = t.getCzyl();
-								zyl =jzl;
-								Double yh=0.0;
-								if(zlc>0 ){
-									 yh = Double.parseDouble(df.format(zyl * (t.getZlc() / zlc)));
+			List<Ylb> addList = new ArrayList<Ylb>();
+			List<Ylb> updateList = new ArrayList<Ylb>();
+			Map<String, Object> ylMap=new HashMap<String, Object>();
+			
+			Map<String, Object> cMap=new HashMap<String, Object>();
+			for (int x = 0; x < listpb.size(); x++) {
+				String type = "add";
+				boolean sfdc = true;
+				Map<String, Object> map = listpb.get(x);
+				if (carsMap.get(map.get("clZbh").toString()) != null) {
+					sfdc = carsMap.get(map.get("clZbh").toString());
+				} else {
+					sfdc = true;
+				}
+				if (!sfdc) {
+					// 判断驾驶员驾驶的该车辆是否已经存入了（查出的结果集中日期是相同的，根据驾驶员、内部编号、线路编码判断）
+					Ylb t = new Ylb();
+					for (int k = 0; k < ylList.size(); k++) {
+						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()
+								)) {
+							if(t1.getLp()==null){
+								//同人同车同线路不同路牌的过滤  （考虑到历史数据）
+								if (cMap.get(map.get("clZbh").toString()+map.get("jGh").toString()+map.get("xlBm").toString())==null) {
+									t = t1;
+									type = "update";
+									cMap.put(map.get("clZbh").toString()+map.get("jGh").toString()+map.get("xlBm").toString(),
+											map.get("clZbh").toString());
 								}
-								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){
-									long l=Math.round(nextJzyl);
-									double ylxs=l*100/100;
-//									nextJzyl = Arith.add(nextJzyl,Arith.sub(nextJzyl,ylxs));
-									yh=Arith.add(yh, Arith.sub(nextJzyl,ylxs));
-									t.setYh(yh);
-									t.setJzyl(ylxs);
-									nextJzyl=ylxs;
-								}else{
-									t.setYh(yh);
-									t.setJzyl(nextJzyl);
+							}else{
+								if(t1.getLp().equals(map.get("lpName").toString())){
+									t = t1;
+									type = "update";
 								}
-							} else {
-								t.setCzyl(nextJzyl);
-								Double yh=0.0;
-								if(zlc>0){
-									yh= Double.parseDouble(df.format(zyl * (t.getZlc() / zlc)));
+								
+							}
+						}
+					}
+					// 当日的第一个班次，出场油量等于前一天的最后一个班次的进场油量
+					if (map.get("seqNumber").toString().equals("1")) {
+						boolean fage = true;
+						if(line.equals("")){
+							for (int i = 0; i < ylListBe.size(); i++) {
+								Ylb ylb = ylListBe.get(i);
+								if (map.get("clZbh").toString().equals(ylb.getNbbm())) {
+									if(ylb.getJzyl()>0){
+										t.setCzyl(ylb.getJzyl());
+										fage = false;
+										break;
+									}
+									
 								}
-								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;
-									if(j==iterator2.size()-1){
-										ylxs=czyl;
-									}else{
-										if(iterator2.get(j+1).getNbbm().equals(t.getNbbm())){
-											l=Math.round(nextJzyl);
-											ylxs=l*100/100;
-										}else{
-											ylxs=czyl;
+							}
+							if (fage) {
+								for (int y = 0; y < clyList.size(); y++) {
+									Cyl cyl = clyList.get(y);
+									if (map.get("clZbh").toString().equals(cyl.getNbbm())) {
+										if(cyl!=null){
+											if(cyl.getCyl()>=0){
+												t.setCzyl(cyl.getCyl());
+												fage = false;
+												break;
+											}else {
+												if(cyl.getCxrl()!=null){
+													if(cyl.getCxrl()>0){
+														t.setCzyl(cyl.getCxrl());
+														fage = false;
+														break;
+													}
+												}
+											}
 										}
-										
 									}
-									yh=Arith.add(yh, Arith.sub(nextJzyl,ylxs));
-//									nextJzyl = Arith.add(nextJzyl,Arith.sub(nextJzyl,ylxs));
-									
-									t.setYh(yh);
-									t.setJzyl(ylxs);
-									nextJzyl=ylxs;
-								}else{
-									t.setYh(yh);
-									t.setJzyl(nextJzyl);
 								}
 							}
-							if(t.getJzyl()<0){
-								t.setJzyl(0.0);
-							}
-							if(t.getCzyl()<0){
+							if (fage) {
 								t.setCzyl(0.0);
 							}
-							if(t.getYh()<0){
-								t.setYh(0.0);
+						}else{
+							if (line.equals(map.get("xlBm").toString())) {
+								for (int i = 0; i < ylListBe.size(); i++) {
+									Ylb ylb = ylListBe.get(i);
+									if (map.get("clZbh").toString().equals(ylb.getNbbm())) {
+										if(ylb.getJzyl()>0){
+											t.setCzyl(ylb.getJzyl());
+											fage = false;
+											break;
+										}
+										
+									}
+								}
+								if (fage) {
+									for (int y = 0; y < clyList.size(); y++) {
+										Cyl cyl = clyList.get(y);
+										if (map.get("clZbh").toString().equals(cyl.getNbbm())) {
+											if(cyl!=null){
+												if(cyl.getCyl()>=0){
+													t.setCzyl(cyl.getCyl());
+													fage = false;
+													break;
+												}else {
+													if(cyl.getCxrl()!=null){
+														if(cyl.getCxrl()>0){
+															t.setCzyl(cyl.getCxrl());
+															fage = false;
+															break;
+														}
+													}
+												}
+											}
+										}
+									}
+								}
+								if (fage) {
+									t.setCzyl(0.0);
+								}
 							}
-							if(t.getSh()<0){
-								t.setSh(0.0);
+						}
+						
+					}
+					
+					Double jzl = 0.0;
+					//一人一车加注量只匹配一次
+					if(ylMap.get(map.get("clZbh").toString()+"_"+ map.get("jGh").toString())==null){
+						
+						boolean fage2=false;
+						for (int i = 0; i < ylxxList.size(); i++) {
+							Ylxxb ylxxb = ylxxList.get(i);
+							if (map.get("clZbh").toString().equals(ylxxb.getNbbm())
+									&& map.get("jGh").toString().equals(ylxxb.getJsy())
+									&& ylxxb.getJylx()==1) {
+								if(ylxxb.getJzl()>0){
+									fage2=true;
+								}
+								
 							}
-							repository.save(t);
 						}
-						map2.put("status", ResponseCode.SUCCESS);
+						//车辆的加注量如果有任工干预，略接口过来 数据
+						if(fage2){
+							// 把当天手工输入的的YLXXB的加注量设置为当天YLB的加注量（根据车号，驾驶员判断,加油类型为1）
+							for (int j = 0; j < ylxxList.size(); j++) {
+								Ylxxb ylxxb = ylxxList.get(j);
+								if (map.get("clZbh").toString().equals(ylxxb.getNbbm())
+										&& map.get("jGh").toString().equals(ylxxb.getJsy())
+										&& ylxxb.getJylx()==1) {
+									jzl =Arith.add(jzl, ylxxb.getJzl());
+								}
+							}
+							ylMap.put(map.get("clZbh").toString()+"_"+ map.get("jGh").toString(),map.get("xlBm") == null ? "" : map.get("xlBm").toString());
+						}else{
+							// 把当天的YLXXB的加注量设置为当天YLB的加注量（根据车号，驾驶员判断）
+							for (int j = 0; j < ylxxList.size(); j++) {
+								Ylxxb ylxxb = ylxxList.get(j);
+								if (map.get("clZbh").toString().equals(ylxxb.getNbbm())
+										&& map.get("jGh").toString().equals(ylxxb.getJsy())) {
+									jzl =Arith.add(jzl, ylxxb.getJzl());
+								}
+							}
+							ylMap.put(map.get("clZbh").toString()+"_"+ map.get("jGh").toString(),map.get("xlBm") == null ? "" : map.get("xlBm").toString());
+						}
+						
+					}
+					t.setJzl(jzl);
+					t.setNbbm(map.get("clZbh").toString());
+					t.setJsy(map.get("jGh") == null ? "" : map.get("jGh").toString());
+					t.setZlc(map.get("totalKilometers") == null ? 0.0
+							: Double.parseDouble(map.get("totalKilometers").toString()));
+					t.setXlbm(map.get("xlBm") == null ? "" : map.get("xlBm").toString());
+					t.setJcsx(Integer.parseInt(map.get("seqNumber").toString()));
+					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.setRq(sdf.parse(rq));
+					t.setLp(map.get("lpName")==null?"":map.get("lpName").toString());
+					t.setJname(map.get("jName").toString());
+					 if(!(t.getSsgsdm().equals("") || t.getFgsdm().equals(""))){
+						 if(type.equals("add")){
+							 t.setCreatetime(date);
+							 addList.add(t); 
+						 }else{
+							 t.setUpdatetime(date);
+						     updateList.add(t); 
+						  }
+					 }
+//					repository.save(t);
+					newMap.put("status", ResponseCode.SUCCESS);
+
+				}
+			}
+			if(addList.size()>0){ 
+				try {
+					new BatchSaveUtils<Ylb>().saveList2(addList, Ylb.class); 
+				} catch (Exception e) {
+					// TODO: handle exception
+					if(e.getMessage().indexOf("PK_YLB_UK")>0){
+						newMap.put("fage", "存在相同数据,数据已经过滤");
+						logger.info("获取:存在相同数据,数据已经过滤");
 					}
 				}
+				
+			}
+			if(updateList.size()>0){
+				for (int i = 0; i < updateList.size(); i++) {
+					repository.save(updateList.get(i));
+				}
 			}
-			
 			SysUser user = SecurityUtils.getCurrentUser();
 			Nylog nylog=new Nylog();
 			nylog.setCreatedate(new Date());
-			nylog.setCzmc("进场等于出场");
+			nylog.setCzmc("获取加存油");
 			nylog.setNylx("油");
 			nylog.setUserid(user.getUserName());
 			nylog.setUsername(user.getName());
-			nylog.setCxtj(rq+"-"+gsbm+"-"+fgsbm+"-"+xlbm+"-"+nbbm+"-"+sxtj);
-			
+			nylog.setCxtj(rq+"-"+gsbm+"-"+fgsbm+"-"+line+"-"+nbbm+"-"+sxtj);
 			nylogRepository.save(nylog);
+			newMap.put("status", ResponseCode.SUCCESS);
 		} catch (Exception e) {
-			map2.put("status", ResponseCode.ERROR);
-			logger.error("save erro.", e);
-			throw e; 
+			// TODO Auto-generated catch block
+			newMap.put("status", ResponseCode.ERROR);
+			throw e;
 		}
-		return map2;
+
+		return newMap;
 	}
-
+	
 	/**
-	 * 核对，有加注没里程
-	 * @param map
-	 * @return
+	 * 进场等于出场
 	 */
-	@Transactional
+	@Transactional  
 	@Override
-	public Map<String, Object> checkYl(Map<String, Object> map) throws Exception{
-		Map<String, Object> newMap=new HashMap<String,Object>();
-//		String xlbm="";
-//		if(map.get("xlbm_like")!=null){
-//			xlbm=map.get("xlbm_like").toString();
-//		}
+	public Map<String, Object> outAndIn(Map<String, Object> map) throws Exception{
 		// 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());
+		String xlbm="";
+		if(map.get("xlbm_like")!=null){
+			xlbm= map.get("xlbm_like").toString().trim();
+		}
+		String gsbm="";
+		if(map.get("ssgsdm_like")!=null){
+			gsbm=map.get("ssgsdm_like").toString();
+		}
+		String fgsbm="";
+		if(map.get("fgsdm_like")!=null){
+			fgsbm=map.get("fgsdm_like").toString();
+		}
+		String rq = map.get("rq").toString();
+		String nbbm="";
+		if(map.get("nbbm_eq")!=null){
+			nbbm=map.get("nbbm_eq").toString();
 		}
-		try{
-			//获取车辆存油信息
-			
-			String rq=map.get("rq").toString();
-			String xlbm="";
-			if(map.get("xlbm_like")!=null){
-				xlbm= map.get("xlbm_like").toString().trim();
-			}
-			String gsbm="";
-			if(map.get("ssgsdm_like")!=null){
-				gsbm=map.get("ssgsdm_like").toString();
-			}
-			String fgsbm="";
-			if(map.get("fgsdm_like")!=null){
-				fgsbm=map.get("fgsdm_like").toString();
-			}
-			String nbbm="";
-			if(map.get("nbbm_eq")!=null){
-				nbbm=map.get("nbbm_eq").toString();
+		Map<String, Object> newMap=new HashMap<String,Object>();
+		Map<String, Object> map2=new HashMap<String,Object>();
+		try {
+			SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+
+			map.put("rq_eq", sdf.parse(rq));
+//			List<Cyl> clyList = cylRepository.obtainCyl();
+			// 获取车辆存油信息
+			List<Cyl> cylList = cylRepository.obtainCyl(nbbm,gsbm);
+			// 指定日期YLB信息
+			List<Ylb> ylbList =new ArrayList<Ylb>();
+			List<Ylb> ylbLists =new ArrayList<Ylb>();
+			List<Ylb> iterator2=new ArrayList<Ylb>();
+			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();
+			if(sxtj.equals("0")){
+				ylbList=ylbLists;
+			}else{
+				List<Object[]> objectLists=repository.checkNbmmNum(rq, gsbm, fgsbm, xlbm,nbbm);
+				List<String> stringList=new ArrayList<String>();
+				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);
+						}
+					}
+				}
+				
+				for (int i = 0; i < stringList.size(); i++) {
+					String strNbbm=stringList.get(i);
+					for (int j = 0; j < ylbLists.size(); j++) {
+						Ylb y = ylbLists.get(j);
+						String mapNbbm=y.getNbbm();
+						if(strNbbm.equals(mapNbbm)){
+							ylbList.add(y);
+						}
+					}
+				}
 			}
-//			List<Ylb> ylListBe=repository.obtainYlbefore(rq, gsbm, "", xlbm, nbbm);
-			List<Ylb> ylListBe=this.listByRqJcsx(rq, gsbm, fgsbm, "", nbbm);
+			
+			for (int i=0;i<ylbList.size();i++) {
+				Ylb ylb = ylbList.get(i);
+				// 判断是否已经计算过
+				if (newMap.get("nbbm" + ylb.getNbbm()) == null) {
+					String nbbm_eq = ylb.getNbbm();
+					Date rq_eq = ylb.getRq();
+					// 得到一天总的加油和里程（根据车，时间）
+					List<Object[]> sumList = repository.sumLcYl(nbbm_eq, rq_eq,"",gsbm,fgsbm);
+					// 保存总的加油量
+					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);
+					// 保留两位小数
+					DecimalFormat df = new DecimalFormat("#.00");
+					Double zyl = 0.0;
+					Double nextJzyl = 0.0;
+					// 保存已经计算过的车辆，相同车辆编号的车不在计算
+					newMap.put("nbbm" + ylb.getNbbm(), ylb.getNbbm());
+
+					// 查询指定车辆，设置进、存、耗油量
+					map.remove("nbbm_eq");
+					map.put("nbbm_eq", ylb.getNbbm());
+					map.put("xlbm_like", ylb.getXlbm());
+//					Iterator<Ylb> iterator2 = repository
+//							.findAll(new CustomerSpecs<Ylb>(map), new Sort(Direction.ASC, "jcsx")).iterator();
+					double czyl=0.0;
+					for (int j = 0; j < iterator2.size(); j++) {
+						Ylb t = iterator2.get(j);
+						if(t.getNbbm().equals(ylb.getNbbm())){
+							if (t.getJcsx() == 1) {
+								// 进场等于出场的操作 既 最后进场存油量等于第一次的出场存油量
+//								Double yl = t.getCzyl();
+//								Double jcyl = t.getCzyl();
+								czyl = t.getCzyl();
+								zyl =jzl;
+								Double yh=0.0;
+								if(zlc>0 ){
+									 yh = Double.parseDouble(df.format(zyl * (t.getZlc() / zlc)));
+								}
+								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){
+									long l=Math.round(nextJzyl);
+									double ylxs=l*100/100;
+//									nextJzyl = Arith.add(nextJzyl,Arith.sub(nextJzyl,ylxs));
+									yh=Arith.add(yh, Arith.sub(nextJzyl,ylxs));
+									t.setYh(yh);
+									t.setJzyl(ylxs);
+									nextJzyl=ylxs;
+								}else{
+									t.setYh(yh);
+									t.setJzyl(nextJzyl);
+								}
+							} else {
+								t.setCzyl(nextJzyl);
+								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);
+//								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;
+									if(j==iterator2.size()-1){
+										ylxs=czyl;
+									}else{
+										if(iterator2.get(j+1).getNbbm().equals(t.getNbbm())){
+											l=Math.round(nextJzyl);
+											ylxs=l*100/100;
+										}else{
+											ylxs=czyl;
+										}
+										
+									}
+									yh=Arith.add(yh, Arith.sub(nextJzyl,ylxs));
+//									nextJzyl = Arith.add(nextJzyl,Arith.sub(nextJzyl,ylxs));
+									
+									t.setYh(yh);
+									t.setJzyl(ylxs);
+									nextJzyl=ylxs;
+								}else{
+									t.setYh(yh);
+									t.setJzyl(nextJzyl);
+								}
+							}
+							if(t.getJzyl()<0){
+								t.setJzyl(0.0);
+							}
+							if(t.getCzyl()<0){
+								t.setCzyl(0.0);
+							}
+							if(t.getYh()<0){
+								t.setYh(0.0);
+							}
+							if(t.getSh()<0){
+								t.setSh(0.0);
+							}
+							repository.save(t);
+						}
+						map2.put("status", ResponseCode.SUCCESS);
+					}
+				}
+			}
+			
+			SysUser user = SecurityUtils.getCurrentUser();
+			Nylog nylog=new Nylog();
+			nylog.setCreatedate(new Date());
+			nylog.setCzmc("进场等于出场");
+			nylog.setNylx("油");
+			nylog.setUserid(user.getUserName());
+			nylog.setUsername(user.getName());
+			nylog.setCxtj(rq+"-"+gsbm+"-"+fgsbm+"-"+xlbm+"-"+nbbm+"-"+sxtj);
+			
+			nylogRepository.save(nylog);
+		} catch (Exception e) {
+			map2.put("status", ResponseCode.ERROR);
+			logger.error("save erro.", e);
+			throw e; 
+		}
+		return map2;
+	}
+	
+
+	/**
+	 * 核对，有加注没里程
+	 * @param map
+	 * @return
+	 */
+	@Transactional
+	@Override
+	public Map<String, Object> checkYl(Map<String, Object> map) throws Exception{
+		Map<String, Object> newMap=new HashMap<String,Object>();
+//		String xlbm="";
+//		if(map.get("xlbm_like")!=null){
+//			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{
+			//获取车辆存油信息
+			
+			String rq=map.get("rq").toString();
+			String xlbm="";
+			if(map.get("xlbm_like")!=null){
+				xlbm= map.get("xlbm_like").toString().trim();
+			}
+			String gsbm="";
+			if(map.get("ssgsdm_like")!=null){
+				gsbm=map.get("ssgsdm_like").toString();
+			}
+			String fgsbm="";
+			if(map.get("fgsdm_like")!=null){
+				fgsbm=map.get("fgsdm_like").toString();
+			}
+			String nbbm="";
+			if(map.get("nbbm_eq")!=null){
+				nbbm=map.get("nbbm_eq").toString();
+			}
+//			List<Ylb> ylListBe=repository.obtainYlbefore(rq, gsbm, "", xlbm, nbbm);
+			List<Ylb> ylListBe=this.listByRqJcsx(rq, gsbm, fgsbm, "", nbbm);
 			List<Ylb> ylbList=this.listOrderBy(rq,gsbm,fgsbm,xlbm,nbbm,"nbbm");
 //					repository.obtainYl(rq,gsbm,fgsbm,xlbm,nbbm,"nbbm");
 //			List<Ylxxb> ylxxbList=ylxxbRepository.obtainYlxx(rq,0,gsbm);
@@ -1656,6 +1975,373 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 		return lists;
 	}
+	
+	@Override
+	public Map<String, Object> updateHistoryJd(Map<String, Object> map) throws Exception {
+		// TODO Auto-generated method stub
+		Map<String, Object> newMap = new HashMap<String, Object>();
+
+		List<Cars> carsList = carsRepository.findCars();
+		Map<String, Object> carsMap = new HashMap<String, Object>();
+		for (int i = 0; i < carsList.size(); i++) {
+			Cars c = carsList.get(i);
+			carsMap.put(c.getInsideCode(), c.getNyType());
+		}
+		try{
+			String date = map.get("date").toString();
+			String line = map.get("line").toString();
+			List<Line> listLine=lineRepository.findLineByCode(line);
+			String gsdm ="";
+			String fgsdm ="";
+			if(listLine.size()>0){
+				Line l=listLine.get(0);
+				gsdm=l.getCompany();
+				fgsdm=l.getBrancheCompany();
+			}
+			
+			String nbbmstr="";
+			List<Map<String, Object>> listpbYc=new ArrayList<Map<String, Object>>();//油车数据
+			List<Map<String, Object>> listpbDc=new ArrayList<Map<String, Object>>();//电车数据
+			List<Map<String,Object>> listpb=scheduleRealInfoService.yesterdayDataList("", date,gsdm, fgsdm, "", "");
+			for (int i = 0; i < listpb.size(); i++) {
+				if(listpb.get(i).get("xlBm").toString().equals(line)){
+					nbbmstr +=listpb.get(i).get("clZbh").toString();
+				}
+			}
+			for (int i = 0; i < listpb.size(); i++) {
+				String sfdc="3";
+				Map<String, Object> m = listpb.get(i);
+				if (carsMap.get(m.get("clZbh").toString()) != null) {
+					sfdc =m.get("clZbh").toString();
+				} 
+				if(nbbmstr.indexOf(m.get("clZbh").toString())>-1){
+					if(!sfdc.equals("3")){
+						if(sfdc.equals("0")){
+							listpbYc.add(m);
+						}else if(sfdc.equals("1")){
+							listpbDc.add(m);
+						}else{
+							listpbDc.add(m);
+							listpbYc.add(m);
+						}
+					}
+				}
+			}
+			SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+			//初始存油量
+			List<Cyl> clyList = cylRepository.obtainCyl("",gsdm);
+			List<Ylxxb> ylxxList = ylxxbRepository.obtainYlxx(date, 0,gsdm);
+			//重新统计油车数据开始
+			List<Ylb> ylListBe =repository.listByRqJcsx(date, gsdm, fgsdm, "", "");
+			List<Ylb> ylbList=this.listOrderBy(date,gsdm,fgsdm,"","","nbbm");
+			List<Ylb> ylbList_upd=new ArrayList<Ylb>(); 
+			List<Ylb> ylbList_del=new ArrayList<Ylb>(); 
+			
+			for (int j = 0; j < ylbList.size(); j++) {
+				Ylb t=ylbList.get(j);
+				boolean fage=true;
+				if(t.getLp().isEmpty()){
+					fage=false;
+				}else{
+					for (int i = 0; i < listpbYc.size(); i++) {
+						Map<String, Object> m = listpbYc.get(i);
+						if(t.getNbbm().equals(m.get("clZbh").toString())
+						&&t.getJsy().equals(m.get("jGh").toString())
+						&&t.getXlbm().equals(m.get("xlBm").toString())
+						&&t.getLp().equals(m.get("lpName").toString())){
+							//该条记录不用删除
+							fage =false;
+							ylbList_upd.add(t);
+						}
+					}
+				}
+				if(fage){
+					if(t.getXlbm().equals(line)){
+						ylbList_del.add(t);
+					}
+				}
+				
+			}
+			String nbbmStr="";
+			List<Ylb> list=new ArrayList<Ylb>();
+			/*
+			 * 第一步 修改车辆里程 和加注量
+			 */
+			Map<String, Object> ylMap=new HashMap<String, Object>();
+			for (int x = 0; x < listpbYc.size(); x++) {
+				String type = "add";
+				Map<String, Object> maps = listpbYc.get(x);
+					// 判断驾驶员驾驶的该车辆是否已经存入了（查出的结果集中日期是相同的，根据驾驶员、内部编号、线路编码判断）
+					Ylb t = new Ylb();
+					for (int k = 0; k < ylbList_upd.size(); k++) {
+						Ylb t1 = ylbList_upd.get(k);
+						if (t1.getNbbm().equals(maps.get("clZbh").toString())
+								&& t1.getJsy().equals(maps.get("jGh").toString())
+								&& t1.getXlbm().equals(maps.get("xlBm").toString())
+								&& t1.getLp().equals(maps.get("lpName").toString())) {
+									t = t1;
+									type = "update";
+						}
+					}
+					if(type.equals("add")){
+						// 当日的第一个班次，出场油量等于前一天的最后一个班次的进场油量
+						if (maps.get("seqNumber").toString().equals("1")) {
+							boolean fage = true;
+							for (int i = 0; i < ylListBe.size(); i++) {
+								Ylb ylb = ylListBe.get(i);
+								if (maps.get("clZbh").toString().equals(ylb.getNbbm())) {
+									if(ylb.getJzyl()>0){
+										t.setCzyl(ylb.getJzyl());
+										fage = false;
+										break;
+									}
+								}
+							}
+							if (fage) {
+								for (int y = 0; y < clyList.size(); y++) {
+									Cyl cyl = clyList.get(y);
+									if (maps.get("clZbh").toString().equals(cyl.getNbbm())) {
+										if(cyl!=null){
+											if(cyl.getCyl()>=0){
+												t.setCzyl(cyl.getCyl());
+												fage = false;
+												break;
+											}else {
+												if(cyl.getCxrl()!=null){
+													if(cyl.getCxrl()>0){
+														t.setCzyl(cyl.getCxrl());
+														fage = false;
+														break;
+													}
+												}
+											}
+										}
+									}
+								}
+							}
+							if (fage) {
+								t.setCzyl(0.0);
+							}
+						}
+					}
+					
+					Double jzl = 0.0;
+					//一人一车加注量只匹配一次
+					if(ylMap.get(maps.get("clZbh").toString()+"_"+ maps.get("jGh").toString())!=null){
+					}else{
+						boolean fage2=false;
+						for (int i = 0; i < ylxxList.size(); i++) {
+							Ylxxb ylxxb = ylxxList.get(i);
+							if (maps.get("clZbh").toString().equals(ylxxb.getNbbm())
+									&& maps.get("jGh").toString().equals(ylxxb.getJsy())
+									&& ylxxb.getJylx()==1) {
+								if(ylxxb.getJzl()>0){
+									fage2=true;
+								}
+							}
+						}
+						//车辆的加注量如果有任工干预，略接口过来 数据
+						if(fage2){
+							// 把当天手工输入的的YLXXB的加注量设置为当天YLB的加注量（根据车号，驾驶员判断,加油类型为1）
+							for (int j = 0; j < ylxxList.size(); j++) {
+								Ylxxb ylxxb = ylxxList.get(j);
+								if (maps.get("clZbh").toString().equals(ylxxb.getNbbm())
+										&& maps.get("jGh").toString().equals(ylxxb.getJsy())
+										&& ylxxb.getJylx()==1) {
+									jzl =Arith.add(jzl, ylxxb.getJzl());
+								}
+							}
+							ylMap.put(maps.get("clZbh").toString()+"_"+ maps.get("jGh").toString(),maps.get("xlBm") == null ? "" : maps.get("xlBm").toString());
+						}else{
+							// 把当天的YLXXB的加注量设置为当天YLB的加注量（根据车号，驾驶员判断）
+							for (int j = 0; j < ylxxList.size(); j++) {
+								Ylxxb ylxxb = ylxxList.get(j);
+								if (maps.get("clZbh").toString().equals(ylxxb.getNbbm())
+										&& maps.get("jGh").toString().equals(ylxxb.getJsy())) {
+									jzl =Arith.add(jzl, ylxxb.getJzl());
+								}
+							}
+							ylMap.put(maps.get("clZbh").toString()+"_"+ maps.get("jGh").toString(),maps.get("xlBm") == null ? "" : maps.get("xlBm").toString());
+						}
+					}
+					t.setJzl(jzl);
+					t.setNbbm(maps.get("clZbh").toString());
+					t.setJsy(maps.get("jGh") == null ? "" : maps.get("jGh").toString());
+					t.setJname(maps.get("jName").toString());
+					t.setZlc(maps.get("totalKilometers") == null ? 0.0
+							: Double.parseDouble(maps.get("totalKilometers").toString()));
+					t.setXlbm(maps.get("xlBm") == null ? "" : maps.get("xlBm").toString());
+					t.setJcsx(Integer.parseInt(maps.get("seqNumber").toString()));
+					t.setSsgsdm(maps.get("company") == null ? "" : maps.get("company").toString());
+					t.setFgsdm(maps.get("bCompany") == null ? "" : maps.get("bCompany").toString());
+					t.setJhsj(maps.get("fcsj")==null?"":maps.get("fcsj").toString());
+					t.setRq(sdf.parse(date));
+					t.setLp(maps.get("lpName")==null?"":maps.get("lpName").toString());
+					if(!(t.getSsgsdm().equals("") || t.getFgsdm().equals(""))){
+						 if(type.equals("add")){
+							 if(nbbmStr.indexOf(t.getNbbm())<0){
+								 nbbmStr +=t.getNbbm()+",";
+							 }
+							 t.setCreatetime(new Date());
+						 }else{
+							 t.setUpdatetime(new Date());
+						 }
+				    }
+					try {
+					    repository.save(t);
+					} catch (Exception e) {
+						// TODO: handle exception
+						if(e.getMessage().indexOf("PK_YLB_UK")>0){
+							newMap.put("fage", "存在相同数据,数据已经过滤");
+							logger.info("油量存在相同数据,数据已经过滤");
+						}
+					}
+				    
+			    }
+				for (int i = 0; i < ylbList_del.size(); i++) {
+					Ylb y=ylbList_del.get(i);
+					if(nbbmStr.indexOf(y.getNbbm())<0){
+						 nbbmStr +=y.getNbbm()+",";
+					 }
+					repository.delete(y.getId());
+				}
+				
+				//重新计算删除了的或者新增了的车的车的油耗信息（考虑车辆可能跨线路，从分公司赛选计算）
+				double czyl=0.0;
+				List<Ylb> iterator2=this.listOrderBy(date,gsdm,fgsdm,"","","nbbm,jcsx");
+				String[] nbbms=nbbmStr.split(",");
+				for (int i = 0; i < nbbms.length; i++) {
+					String clzbm=nbbms[i];
+					// 得到一天总的加油和里程（根据车，时间）
+					List<Object[]> sumList = repository.sumLcYl(clzbm, sdf.parse(date),"",gsdm,fgsdm);
+					// 保存总的加油量
+					Double jzl = 0.0;
+					// 保存总的里程
+					Double zlc = 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()));
+					}
+					// 保留两位小数
+					DecimalFormat df = new DecimalFormat("#.00");
+					Double zyl = 0.0;
+					Double nextJzyl = 0.0;
+					for (int j = 0; j < iterator2.size(); j++) {
+						Ylb t = iterator2.get(j);
+						if(t.getNbbm().equals(clzbm)){
+							if (t.getJcsx() == 1) {
+								// 进场等于出场的操作 既 最后进场存油量等于第一次的出场存油量
+								czyl = t.getCzyl();
+								zyl =jzl;
+								Double yh=0.0;
+								if(zlc>0 ){
+									 yh = Double.parseDouble(df.format(zyl * (t.getZlc() / zlc)));
+								}
+								nextJzyl =Arith.sub( Arith.add(t.getJzl(), t.getCzyl()),yh);
+								//把进场油量的小数和整数分别取出
+								if(zlc>0 && t.getZlc()>0){
+									long l=Math.round(nextJzyl);
+									double ylxs=l*100/100;
+									yh=Arith.add(yh, Arith.sub(nextJzyl,ylxs));
+									t.setYh(yh);
+									t.setJzyl(ylxs);
+									nextJzyl=ylxs;
+								}else{
+									t.setYh(yh);
+									t.setJzyl(nextJzyl);
+								}
+							} else {
+								t.setCzyl(nextJzyl);
+								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);
+								if(zlc>0 && t.getZlc()>0){
+									long l=0l;
+									double ylxs=0.0;
+									if(j==iterator2.size()-1){
+										ylxs=czyl;
+									}else{
+										if(iterator2.get(j+1).getNbbm().equals(t.getNbbm())){
+											l=Math.round(nextJzyl);
+											ylxs=l*100/100;
+										}else{
+											ylxs=czyl;
+										}
+										
+									}
+									yh=Arith.add(yh, Arith.sub(nextJzyl,ylxs));
+									t.setYh(yh);
+									t.setJzyl(ylxs);
+									nextJzyl=ylxs;
+								}else{
+									t.setYh(yh);
+									t.setJzyl(nextJzyl);
+								}
+							}
+							if(t.getJzyl()<0){
+								t.setJzyl(0.0);
+							}
+							if(t.getCzyl()<0){
+								t.setCzyl(0.0);
+							}
+							if(t.getYh()<0){
+								t.setYh(0.0);
+							}
+							if(t.getSh()<0){
+								t.setSh(0.0);
+							}
+							repository.save(t);
+						}
+					}
+				}
+				
+				//重新统计油车数据结束
+				
+				
+				//重新获取电耗数据开始
+				Map<String, List<Dlb>> mapList=dlbService.updeteHistory(listpbDc, date, gsdm, fgsdm, line);
+				List<Dlb> delDlb=mapList.get("delList");
+				for (int i = 0; i < delDlb.size(); i++) {
+					Dlb d=delDlb.get(i);
+					dlbRepository.delete(d.getId());
+				}
+				List<Dlb> updDlb=mapList.get("updList");
+				for (int i = 0; i < updDlb.size(); i++) {
+					Dlb d=updDlb.get(i);
+					try {
+						dlbRepository.save(d);
+					} catch (Exception e) {
+						// TODO: handle exception
+						if(e.getMessage().indexOf("PK_DLB_UK")>0){
+							newMap.put("fage", "存在相同数据,数据已经过滤");
+							logger.info("电量存在相同数据,数据已经过滤");
+						}
+					}
+				}
+				//重新获取电耗数据结束
+				
+				SysUser user = SecurityUtils.getCurrentUser();
+				Nylog nylog=new Nylog();
+				nylog.setCreatedate(new Date());
+				nylog.setCzmc("重新统计");
+				nylog.setNylx("油");
+				nylog.setUserid(user.getUserName());
+				nylog.setUsername(user.getName());
+				nylog.setCxtj(line+"-"+ date+"-"+gsdm+"-"+fgsdm);
+				nylogRepository.save(nylog);
+				newMap.put("status", ResponseCode.SUCCESS);
+			}catch(Exception e){
+				// TODO Auto-generated catch block
+				newMap.put("status", ResponseCode.ERROR);
+				throw e;
+			}
+		
+		
+		return newMap;
+	}
+	
 	@Override
 	public Map<String, Object> updateHistory(Map<String, Object> map) throws Exception {
 		// TODO Auto-generated method stub
+<div class="page-head">
+    <div class="page-title">
+        <h1>进出场存电量</h1>
+    </div>
+</div>
+
+<ul class="page-breadcrumb breadcrumb">
+    <li><a href="/pages/home.html" data-pjax>首页</a> <i class="fa fa-circle"></i></li>
+    <li><span class="active">用电管理</span> <i class="fa fa-circle"></i></li>
+    <li><span class="active">进出场存电量</span></li>
+</ul>
+
+<div class="row" id="dl_oil_list">
+    <div class="col-md-12">
+        <!-- Begin: life time stats -->
+        <div class="portlet light portlet-fit portlet-datatable bordered">
+            <div class="portlet-title">
+                <div class="caption">
+                    <i class="fa fa-fire-extinguisher"></i> <span
+                        class="caption-subject font-dark sbold uppercase">进出场存电量表</span>
+                </div>
+                <div class="actions">
+                      <button type="button" class="btn btn-circle blue" id="saveButton"><i class="fa fa-minus-square"></i>
+                        	保存
+                    </button>
+                     <a class="btn btn-circle blue" href="add.html" data-pjax><i class="fa fa-plus"></i> 添加</a>
+                    <button type="button" class="btn btn-circle blue"  id="removeButton"><i class="fa fa-trash-o"></i> 删除</button>
+                    
+                    <button type="button" class="btn btn-circle blue" id="obtain"><i class="fa fa-hourglass-half"></i>
+                  	   获取加/存电信息
+                    </button>
+                     <button type="button" class="btn btn-circle blue" id="checkDl"><i class="fa fa-gg-circle"></i>
+                     	 核对加注量（有加电无里程）
+                    </button>
+                	<button   class="btn btn-circle blue"
+                                   id="export"> <i class="fa fa-file-excel-o"></i>
+                           	导出Excel
+                      </button>
+                </div>
+            </div>
+            <div class="portlet-body">
+                <div class="table-container" style="margin-top: 10px">
+                    <table
+                            class="table table-striped table-bordered table-hover table-checkable"
+                            id="datatable_dlb">
+                        <thead >
+                        <tr role="row" class="filter">
+                        		<td colspan="2">
+                        			<div style="float: right; " >&nbsp;公司</div>
+								</td>
+								<td colspan="3">
+									<div style="float: left;width: 150px">
+										<select class="form-control" name="ssgsdm_like"
+											id="ylbListGsdmId"></select>
+									</div>
+								</td>
+								<td colspan="2">
+									<div style="float: right; " >&nbsp;分公司</div>
+								</td>
+								<td colspan="3">
+									<div style="float: left;">
+										<select class="form-control" name="fgsdm_like"
+											id="ylbListFgsdmId" style="width: 150px"></select>
+									</div>
+								</td>
+								<td >
+									<div style="float: right; ">日期</div>
+								</td>
+								<td colspan="2">
+									<div style="float: left;">
+										<input type="text" style="width: 120px" name="rq" id="rq" />
+									</div>
+                        		</td>
+                        		<td rowspan="2" colspan="2">
+                        			<div style="float: left;">
+									&nbsp;<button
+										class="btn btn-sm green btn-outline filter-submit margin-bottom"
+										style="margin-right: 0px">
+										<i class="fa fa-search"></i> 搜索
+									</button> <!--                                 <button class="btn btn-sm red btn-outline filter-cancel" style="margin-right:0px"> -->
+									<!--                                     <i class="fa fa-times"></i> 重置 -->
+									<!--                                 </button> -->
+
+								</div>
+                        		</td>
+                        </tr>
+                        <tr class="filter2">
+									<td colspan="2">
+									<div style="float: right; ">&nbsp;线路</div>
+									</td>
+									<td colspan="3">
+									<div style="float: left;">
+										<select class="form-control" name="xlbm_like" id="xlbm"
+											style="width: 150px;"></select>
+									</div>
+									</td>
+									<td colspan="2">
+									<div style="float: right;">&nbsp;内部编码</div>
+									</td>
+									<td colspan="3">
+									<div style="float: left;">
+										<select class="form-control" name="nbbm_eq" id="nbbm"
+											style="width: 120px;"></select>
+									</div>
+									<div style="float: left;">
+										<button class="btn btn-sm #000 btn-outline filter-cancel"
+											style="margin-right: 0px">
+											<i class="fa fa-times"></i>
+										</button>
+									</div>
+									</td>
+									<td >
+									<div style="float: right;">
+									类型
+									</div>
+									</td>
+									<td colspan="2">
+									<div style="float: left;">
+										<select class="form-control" name="sxtj">
+												<option value="0">全部</option>
+												<option value="1">一车一单</option>
+												<option value="2">一车多单</option>
+												<option value="3">有充电没里程</option>
+												<option value="4">有里程没充电</option>
+										   </select>
+									</div>
+								
+									</td>
+							</tr>
+							<tr>
+								<td colspan="17">
+								<div style="float: left;">
+									总计 
+									&nbsp;&nbsp;
+									充电量:&nbsp;<label id="sumJzl"></label>
+									&nbsp;&nbsp;
+									耗电量:&nbsp;<label id="sumYh"></label>
+									&nbsp;&nbsp;
+									损耗电量:&nbsp;<label id="sumSh"></label>
+								</div>	
+								</td>
+							</tr>
+                        <tr role="row" class="heading">
+                            <th width="2%">#</th>
+                            <th width="8%">日期</th>
+                            <th width="5%">公司</th>
+                            <th width="8%">线路</th>
+                            <th width="5%">自编号</th>
+                            <th width="6%">驾驶员</th>
+                            <th width="4%">充电量</th>
+                            <th width="6%">出场存电</th>
+                            <th width="6%">进场存电</th>
+                            <th width="5%">耗电</th>
+                            <th width="5%">耗损原因</th>
+                            <th width="4%">耗损电量</th>
+                            <th width="4%">当日总里程</th>
+                            <th width="4%">数据类型</th>
+                            <th width="4%">百公里电耗</th>
+<!--                             <th width="5%">操作</th> -->
+                        </tr>
+                        </thead>
+                        <tbody></tbody>
+                    </table>
+                    <div style="text-align: right;">
+                        <ul id="pagination" class="pagination"></ul>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+
+<script id="dlb_list_temp" type="text/html">
+    {{each list as obj i}}
+    <tr>
+        <td style="vertical-align: middle;">
+            <input type="checkbox" name="id" class="group-checkable icheck" data-id="{{obj.id}}">
+        </td>
+        <td>
+            {{obj.rq}}
+        </td>
+        <td>
+            {{obj.gsname}}
+        </td>
+        <td>
+            {{obj.xlname}}
+        </td>
+        <td>
+			<lable data-id="{{obj.id}}" class="in_carpark_nbbm">{{obj.nbbm}}</lable>
+           
+        </td>
+        <td>
+            {{if obj.jsy=='' || obj.jsy==null }}
+			<input data-id="{{obj.id}}" style=" width:100%"  type="text"  class="in_carpark_jsy" ></input>
+			<button  class="btn btn-sm blue btn-jsyUpdate" style=" width:100%"   data-id="{{obj.id}}">填写工号</button>
+		{{else}}
+			{{obj.jsy}}/{{obj.name}}
+		{{/if}}
+        </td>
+        <td>
+           
+			<lable data-id="{{obj.id}}" class="in_carpark_cdl"> {{obj.cdl}}</lable>
+        </td>
+        <td>
+            
+			<input data-id="{{obj.id}}" href="javascript:;" class="in_carpark_czcd" 
+            type="text" value=" {{obj.czcd}}" style=" width:40px;float:left" 
+onkeyup="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')"  
+            onafterpaste="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')" />
+			<lable style="float:left">%<lable>
+        </td>
+        <td>
+			<input data-id="{{obj.id}}" href="javascript:;" class="in_carpark_jzcd" 
+            type="text" value=" {{obj.jzcd}}" style=" width:40px;float:left"  
+onkeyup="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')"  
+            onafterpaste="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')" />
+	<lable style="float:left">%<lable>
+        </td>
+        <td>
+<input data-id="{{obj.id}}" href="javascript:;" class="in_carpark_hd" readOnly="true" 
+            type="text" value=" {{obj.hd}}" style=" width:45px;float:left"  
+onkeyup="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')"  
+            onafterpaste="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')" />
+        </td>
+        <td>
+			<select data-id="{{obj.id}}" class="in_carpark_shyy" style=" width:80px">
+				<option value='0' {{if obj.shyy==0}}  selected = 'selected' {{/if}}>请选择</option> 
+				<option value='1' {{if obj.shyy==1}}  selected = 'selected' {{/if}}>票务用电</option> 
+				<option value='2' {{if obj.shyy==2}}  selected = 'selected' {{/if}}>保养用电</option> 
+				<option value='3' {{if obj.shyy==3}}  selected = 'selected' {{/if}}>报废车用电</option> 
+				<option value='4' {{if obj.shyy==4}}  selected = 'selected' {{/if}}>其它用电</option> 
+				<option value='5' {{if obj.shyy==5}}  selected = 'selected' {{/if}}>人保部</option> 
+				<option value='6' {{if obj.shyy==6}}  selected = 'selected' {{/if}}>车队</option> 
+				<option value='7' {{if obj.shyy==7}}  selected = 'selected' {{/if}}>车间(高保)</option> 
+				<option value='8' {{if obj.shyy==8}}  selected = 'selected' {{/if}}>车间(小修)</option> 
+			</select>
+        </td>
+        <td>
+		<input data-id="{{obj.id}}" href="javascript:;" class="in_carpark_shyl"
+			value={{obj.sh}} style=" width:40px" type="text" 
+onkeyup="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')"  
+            onafterpaste="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')" />
+        
+</td>
+        <td>
+            {{obj.zlc}}
+        </td>
+        <td>
+			<select data-id="{{obj.id}}" class="in_carpark_yhlx">
+				<option value='0' {{if obj.yhlx==0}}  selected = 'selected' {{/if}}>手录</option> 
+				<option value='1' {{if obj.yhlx==1}}  selected = 'selected' {{/if}}>拆分</option> 
+			</select>
+        </td>
+        <td>
+            {{obj.bglyh}}
+        </td>
+    </tr>
+    {{/each}}
+    {{if list.length == 0}}
+    <tr>
+        <td colspan=15><h6 class="muted">没有找到相关数据</h6></td>
+    </tr>
+    {{/if}}
+</script>
+
+<script>
+    $(function () {
+    	var fage=false;
+        //var id = 15;
+        //$('.in_carpark_jzcd[data-id='+id+']', '#dl_oil_list')
+
+        $("#checkDl").on('click', function () {
+            if ($("#rq").val() != "") {
+            	var params=getParamsList();
+            	$get('/ylb/checkDate',params,function(status){
+            		if(status=='2'){
+               		 layer.msg('只能操作三天内数据.');
+               		}else{
+		                var i = layer.load(2);
+		                $get('/dlb/checkDl', params, function () {
+		                	layer.close(i);
+		                    jsDoQuery(params, true);
+		                });
+               		}
+            	})
+            } else {
+                layer.msg('请选择日期.');
+            }
+        })
+
+        //进场等于出场
+        $("#outAndIn").on('click', function () {
+            console.log("进场油量等于出场油量");
+            if ($("#rq").val() != "") {
+            	var params=getParamsList();
+            	$get('/ylb/checkDate',params,function(status){
+            		if(status=='2'){
+               		 layer.msg('只能操作三天内数据.');
+               		}else{
+		                var i = layer.load(2);
+		                $get('/ylb/outAndIn', params, function () {
+		                	layer.close(i);
+		                    jsDoQuery(params, true);
+		                });
+               		}
+            	})
+            } else {
+                layer.msg('请选择日期.');
+            }
+        });
+       
+        
+        //保存
+        $("#saveButton").on('click',function(){
+        	var params_=getParamsList();
+        	$get('/ylb/checkDate',params_,function(status){
+        		if(status=='2'){
+           		 layer.msg('只能操作三天内数据.');
+           		}else{
+		        	var ylArray = [];
+		        	$('input.icheck').each(function(){
+		        		var map = {};
+		        		var id=$(this).data('id');
+		        		var nbbm =$('.in_carpark_nbbm[data-id='+id+']', '#dl_oil_list').html();
+		        		var cdl =$('.in_carpark_cdl[data-id='+id+']', '#dl_oil_list').html();
+		        		if(cdl=="" || cdl ==null){
+		        			cdl=0;
+		        		}
+		        		var czcd=$('.in_carpark_czcd[data-id='+id+']', '#dl_oil_list').val();
+		        		if(czcd=="" || czcd==null){
+		        			czcd=0;
+		        		}
+		        		var jzcd=$('.in_carpark_jzcd[data-id='+id+']', '#dl_oil_list').val();
+		        		if(jzcd=="" || jzcd==null){
+		        			jzcd=0;
+		        		}
+		        		
+		        		var sh =  $('.in_carpark_shyl[data-id='+id+']', '#dl_oil_list').val();
+		        		if(sh=="" || sh==null){
+		        			sh=0;
+		        		}
+		        		
+		                var shyy =  $('.in_carpark_shyy[data-id='+id+']', '#dl_oil_list').val();
+		                var hd = $('.in_carpark_hd[data-id='+id+']', '#dl_oil_list').val();
+		                if(hd=="" || hd==null){
+		                	hd=0;
+		                }
+		                var yhlx = $('.in_carpark_yhlx[data-id='+id+']', '#dl_oil_list').val();
+		                
+		                map['id']=id;
+		                map['cdl']=cdl;
+		                map['czcd']=czcd;
+		                map['jzcd']=jzcd;
+		                map['sh']=sh;
+		                map['shyy']=shyy;
+		                map['yhlx']=yhlx;
+		                map['nbbm']=nbbm;
+		                map['hd']=hd;
+		                map['rq']=$("#rq").val();
+		                ylArray.push(map);
+		        	})
+		        	var params = {};
+		        	params['dlbList']=JSON.stringify(ylArray);
+		        	 var i = layer.load(2);
+		        	  $post('/dlb/saveDlbList', params, function () {
+		             	layer.close(i);
+		             	var params1 =getParamsList();
+		                 jsDoQuery(params1, true);
+		             });  
+           		}
+        	})
+        })
+        //拆分
+        $("#sortButton").on('click', function () {
+            if ($("#rq").val() != "") {
+            	var ylArray = [];
+            	var nbbm="";
+            	var msg="";
+            	 $('input.icheck:checked').each(function(){
+            		 var map = {};
+             		var id=$(this).data('id');
+             		var clzbh =$('.in_carpark_nbbm[data-id='+id+']', '#dl_oil_list').html();
+             		if(nbbm.indexOf(clzbh)>-1){
+             			if(msg==""){
+             				msg += clzbh;
+             			}else{
+             				msg += ","+clzbh;
+             			}
+             		}else{
+             			nbbm +=clzbh;
+             			var jzyl=$('.in_carpark_jzcd[data-id='+id+']', '#dl_oil_list').val();
+                 		var sh =  $('.in_carpark_shyl[data-id='+id+']', '#dl_oil_list').val();
+                        var shyy =  $('.in_carpark_shyy[data-id='+id+']', '#dl_oil_list').val();
+                        var ns =  $('.in_carpark_ns[data-id='+id+']', '#dl_oil_list').val();
+                        var rylx= $('.in_carpark_rylx[data-id='+id+']', '#dl_oil_list').val();
+                        map['id']=id;
+                        map['jzyl']=jzyl;
+                        map['sh']=sh;
+                        map['shyy']=shyy;
+                        map['ns']=ns;
+                        map['rylx']=rylx;
+                        ylArray.push(map);
+             		}
+             		
+            	}) ;
+            	 if(msg!=""){
+            		 layer.msg('内部编码为:【'+msg +'】的车辆请选择一条数据进行拆分.');
+            	 }else{
+            		 var params = {};
+             		params['ylbList']=JSON.stringify(ylArray);
+             		 var i = layer.load(2);
+                     $post('/ylb/sort', params, function () {
+                     	layer.close(i);
+                     	var params1 =getParamsList();
+                         jsDoQuery(params1, true);
+                     }); 
+             		
+            	 }
+            	
+            } else {
+                layer.msg('请选择日期.');
+            }
+        })
+        //获取加存信息
+        $("#obtainJd").on('click', function () {
+            if ($("#rq").val() != "") {
+            	var params=getParamsList();
+            	$get('/ylb/checkDate',params,function(status){
+            		if(status=='2'){
+               		 layer.msg('只能操作三天内数据.');
+               		}else{
+		                var i = layer.load(2);
+		                $get('/dlb/obtain', params, function () {
+		                	layer.close(i);
+		                    jsDoQuery(params, true);
+		                });
+               		}
+            	})
+            } else {
+                layer.msg('请选择日期.');
+            }
+
+        })
+        $("#rq").datetimepicker({
+            format: 'YYYY-MM-DD',
+            locale: 'zh-cn'
+        });
+
+        var page = 0, initPagination;
+        var icheckOptions = {
+            radioClass: 'icheckbox_flat-blue',
+            increaseArea: '20%'
+        }
+
+        //重置
+        $('tr.filter2 .filter-cancel').on('click', function () {
+            $('tr.filter2 , #nbbm').val('').change();
+        });
+
+        //提交
+        $('tr.filter .filter-submit').on('click', function () {
+        	 var ylbGsdm=$("#ylbListGsdmId").val();
+     		var ylbFgsdm=$("#ylbListFgsdmId").val();
+            if ($("#rq").val() == "" || $("#rq").val() ==null){
+            	  layer.msg('请选择日期.');
+            }else if(ylbGsdm=="" || ylbGsdm==null || ylbFgsdm=="" ||ylbFgsdm==null){
+            	 layer.msg('请选择公司和分公司.');
+            }else {
+            	 var params = getParamsList();
+                 
+           	
+                page = 0;
+                jsDoQuery(params, true);
+            } 
+        });
+
+        function getParamsList(){
+        	  var cells = $('tr.filter')[0].cells
+              , cells1 = $('tr.filter2')[0].cells,params = {}
+              , name;
+        	 $.each(cells, function (i, cell) {
+                 var items = $('input,select', cell);
+                 for (var j = 0, item; item = items[j++];) {
+                     name = $(item).attr('name');
+                     if (name) {
+                         params[name] = $(item).val();
+                     }
+                 }
+             });
+             $.each(cells1, function (i, cell) {
+                 var items = $('input,select', cell);
+                 for (var j = 0, item; item = items[j++];) {
+                     name = $(item).attr('name');
+                     if (name) {
+                         params[name] = $(item).val();
+                     }
+                 }
+             });
+        	
+             return params;
+        }
+        
+//         var gsqxdm="";
+    
+    	var xlList;
+    	var obj=[];
+		$.get('/report/lineList',function(result){
+			xlList=result;
+	    	$.get('/user/companyData', function(result){
+	    		obj = result;
+	    		var options="";
+	// 			= '<option value="">请选择</option>';
+	    		for(var i = 0; i < obj.length; i++){
+	    			options += '<option value="'+obj[i].companyCode+'">'+obj[i].companyName+'</option>';
+	//     			setFgsqx(obj[i].companyCode);
+	    		}
+	    		$('#ylbListGsdmId').html(options);
+	    		updateCompany();
+	    	});
+		})
+    	$("#ylbListGsdmId").on("change",updateCompany);
+    	function updateCompany(){
+    		var company = $('#ylbListGsdmId').val();
+    		var options ="";
+//     		= '<option value="">请选择</option>';
+    		for(var i = 0; i < obj.length; i++){
+    			if(obj[i].companyCode == company){
+    				var children = obj[i].children;
+    				for(var j = 0; j < children.length; j++){
+    					options += '<option value="'+children[j].code+'">'+children[j].name+'</option>';
+    				}
+    			}
+    		}
+    		$('#ylbListFgsdmId').html(options);
+    		initXl();
+    		initCl();
+    	}
+        /*
+         * 获取数据 p: 要提交的参数， pagination: 是否重新分页
+         */
+        function jsDoQuery(p, pagination) {
+            var params = {};
+            if (p)
+                params = p;
+            //更新时间排序
+            params['order'] = 'nbbm';
+            params['page'] = page;
+            params['rq'] = $("#rq").val();
+            
+    		
+            var l = layer.load(2);
+            $get('/dlb/dlbList', params, function (data) {
+            
+                $.each(data, function (i, obj) {
+                    obj.rq = moment(obj.rq).format("YYYY-MM-DD");
+                });
+                var bodyHtm = template('dlb_list_temp', {list:data});
+                $('#datatable_dlb tbody').html(bodyHtm);
+                $('.btn-jsyUpdate').on('click', jsyUpdate);
+                layer.close(l);
+            	$get('/dlb/sumYlb',params,function(returns){
+            		$("#sumJzl").html(returns.jzl);
+            		$("#sumYh").html(returns.yh);
+            		$("#sumSh").html(returns.sh);
+        		});
+            	
+            /* 	 $('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){
+             			cdl=0;
+             		}
+             		var sh =  $('.in_carpark_shyl[data-id='+id+']', '#dl_oil_list').val();
+             		if(sh=="" || sh==null){
+             			sh=0;
+             		}
+             		
+             		var sub=numSubtr(cdl*1000,sh*1000);
+             		var subValue=0;
+             		if(sub/1000>=0){
+             			subValue=sub/1000;
+             		}
+             		$('.in_carpark_hd[data-id='+id+']', '#dl_oil_list').val(subValue);
+             		
+                  }); */
+            });
+        }
+        
+        function jsyUpdate(){
+        	var params=getParamsList();
+        	$get('/ylb/checkDate',params,function(status){
+        		if(status=='2'){
+           		 layer.msg('只能操作三天内数据.');
+           		}else{
+					var id = $(this).data('id');
+		    		var jsy=$('.in_carpark_jsy[data-id='+id+']', '#dl_oil_list').val();
+		    		$get('/dlb/updateJsy',{id:id,jsy:jsy}, function(result){
+						layer.msg('修改成功.');
+		                page = 0;
+		                jsDoQuery(params, true);
+					});
+           		}
+        	})
+		}
+      //页面计算防止精度丢失
+		var accAdd = function (a, b) {
+	        var c, d, e;
+	        try {
+	            c = a.toString().split(".")[1].length;
+	        } catch (f) {
+	            c = 0;
+	        }
+	        try {
+	            d = b.toString().split(".")[1].length;
+	        } catch (f) {
+	            d = 0;
+	        }
+	        return e = Math.pow(10, Math.max(c, d)), (mul(a, e) + mul(b, e)) / e;
+	    };
+
+	    var numSubtr = function (a, b) {
+	        var c, d, e;
+	        try {
+	            c = a.toString().split(".")[1].length;
+	        } catch (f) {
+	            c = 0;
+	        }
+	        try {
+	            d = b.toString().split(".")[1].length;
+	        } catch (f) {
+	            d = 0;
+	        }
+	        return e = Math.pow(10, Math.max(c, d)), (a * e - b * e) / e;
+	    };
+	    
+	    function mul(a, b) {
+	        var c = 0,
+	            d = a.toString(),
+	            e = b.toString();
+	        try {
+	            c += d.split(".")[1].length;
+	        } catch (f) {
+	        }
+	        try {
+	            c += e.split(".")[1].length;
+	        } catch (f) {
+	        }
+	        return Number(d.replace(".", "")) * Number(e.replace(".", "")) / Math.pow(10, c);
+	    }
+
+        //改变状态
+        function startOptJzylLink(es) {
+            es.editable({
+                type: 'text',
+                placement: 'right',
+                width: 100,
+                display: false,
+                validate: function (value) {
+                    if (!value)
+                        return '值不能为空！';
+                    if (isNaN(value))
+                        return '只能为数字！';
+                    if (value < 0)
+                        return '值不能小于0！';
+                },
+                inputclass: 'form-control input-medium input-edtable-sm'
+            })
+                    .on('save', function (e, params) {
+                        $(this).text(params.newValue);
+                    });
+        }
+
+        //改变状态
+        function startOptShylLink(es) {
+            es.editable({
+                type: 'text',
+                placement: 'right',
+                width: 100,
+                display: false,
+                validate: function (value) {
+                    if (!value)
+                        return '值不能为空！';
+                    if (isNaN(value))
+                        return '只能为数字！';
+                    if (value < 0)
+                        return '值不能小于0！';
+                },
+                inputclass: 'form-control input-medium input-edtable-sm'
+            })
+                    .on('save', function (e, params) {
+                        $(this).text(params.newValue);
+                    });
+        }
+        function iCheckChange() {
+            var tr = $(this).parents('tr');
+            if (this.checked)
+                tr.addClass('row-active');
+            else
+                tr.removeClass('row-active');
+
+            /* if($('#datatable_resource input.icheck:checked').length == 1)
+             $('#removeButton').removeAttr('disabled');
+             else
+             $('#removeButton').attr('disabled', 'disabled');  */
+        }
+
+        function showPagination(data) {
+            //分页
+            $('#pagination').jqPaginator({
+                totalPages: data.totalPages,
+                visiblePages: 6,
+                currentPage: page + 1,
+                first: '<li class="first"><a href="javascript:void(0);">首页<\/a><\/li>',
+                prev: '<li class="prev"><a href="javascript:void(0);">上一页<\/a><\/li>',
+                next: '<li class="next"><a href="javascript:void(0);">下一页<\/a><\/li>',
+                last: '<li class="last"><a href="javascript:void(0);">尾页<\/a><\/li>',
+                page: '<li class="page"><a href="javascript:void(0);">{{page}}<\/a><\/li>',
+                onPageChange: function (num, type) {
+                    if (initPagination) {
+                        initPagination = false;
+                        return;
+                    }
+
+                    var params=getParamsList();
+                    page = num - 1;
+                    jsDoQuery(params, true);
+                }
+            });
+        }
+
+
+      //删除
+        $('#removeButton').on('click', function () {
+        	var params_=getParamsList();
+        	$get('/ylb/checkDate',params_,function(status){
+        		if(status=='2'){
+           		 layer.msg('只能操作三天内数据.');
+           		}else{
+		        	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{
+			            if(confirm('确定要删除选中的数据？')) 
+			            { 
+			            	 var i = layer.load(2);
+			            	 $post('/dlb/deleteIds', params, function (result) {
+			            		 layer.close(i);
+			            		 var params=getParamsList();
+				            	  jsDoQuery(params, true);
+			                 });
+			            } 
+			       	 }
+           		}
+        	})
+        });
+		
+		
+		$("#ylbListFgsdmId").on("change",initXl);
+		function initXl(){
+			var data=[];
+			data.push({id: " ", text: "全部线路"});
+			if(fage){
+				$("#xlbm").select2("destroy").html('');
+			}
+			var fgs=$('#ylbListFgsdmId').val();
+			var gs=$('#ylbListGsdmId').val();
+			for(var i=0;i<xlList.length;i++){
+				if(gs!=""){
+					if(fgs!=""){
+						if(xlList[i]["fgsbm"]==fgs && xlList[i]["gsbm"]==gs){
+							data.push({id: xlList[i]["xlbm"], text: xlList[i]["xlname"]});
+						}
+					}else{
+						if(xlList[i]["gsbm"]==gs){
+							data.push({id: xlList[i]["xlbm"], text: xlList[i]["xlname"]});
+						}
+					}
+				}
+			}
+			initPinYinSelect2('#xlbm',data,'');
+			fage=true;
+		}
+        	$("#xlbm").on("change",initCl);
+        	function initCl(){
+        	$('#nbbm').select2({
+                placeholder: '搜索车辆...',
+                ajax: {
+                    url: '/report/carList',
+                    dataType: 'json',
+                    delay: 150,
+                    data: function (params) {
+                        return {nbbm: params.term,
+                        	    gsbm:$('#ylbListGsdmId').val(),
+                        	    fgsbm:$('#ylbListFgsdmId').val(),
+                        	    xlbm:$('#xlbm').val()};
+                    },
+                    processResults: function (data) {
+                        return {
+                            results: data
+                        };
+                    },
+                    cache: true
+                },
+                templateResult: function (repo) {
+                    if (repo.loading) return repo.text;
+                    var h = '<span>' + repo.text + '</span>';
+                    h += (repo.lineName ? '&nbsp;<span class="select2-desc">' + repo.lineName + '</span>' : '');
+                    return h;
+                },
+                escapeMarkup: function (markup) {
+                    return markup;
+                },
+                minimumInputLength: 1,
+                templateSelection: function (repo) {
+                    return repo.text;
+                },
+                language: {
+                    noResults: function () {
+                        return '<span style="color:red;font-size: 12px;">没有搜索到车辆！</span>';
+                    },
+                    inputTooShort: function (e) {
+                        return '<span style="color:gray;font-size: 12px;"><i class="fa fa-search"></i> 输入自编号搜索车辆</span>';
+                    },
+                    searching: function () {
+                        return '<span style="color:gray;font-size: 12px;"> 正在搜索车辆...</span>';
+                    }
+                }
+            });
+        	}
+//         }
+        
+
+//导出
+
+        $("#export").on("click", function () {
+            if ($("#rq").val() != "") {
+				 var params=getParamsList();
+                $post('/dlb/listExport', params, function (result) {
+                    window.open("/downloadFile/download?fileName="+$("#rq").val()+"进出场存电量" );
+                });
+            } else {
+                layer.msg('请选择日期.');
+            }
+        });
+
+    });
+</script>
 \ No newline at end of file
+<style type="text/css">
+	   #ylbtable   table>tr> td {
+	     white-space: nowrap;
+		    overflow: hidden;
+		    text-overflow: ellipsis;
+	   }
+	   
+</style>
+	<div class="page-head">
+	    <div class="page-title">
+	        <h1>进出场存油量</h1>
+	    </div>
+	</div>
+	
+	<ul class="page-breadcrumb breadcrumb">
+	    <li><a href="/pages/home.html" data-pjax>首页</a> <i class="fa fa-circle"></i></li>
+	    <li><span class="active">用油管理</span> <i class="fa fa-circle"></i></li>
+	    <li><span class="active">进出场存油量</span></li>
+	</ul>
+	<div id="ll_oil_list"
+		class=" row col-md-12 portlet light porttlet-fit portlet-datatable bordered" style="height: calc(100% - 100px);background-color: #fff">
+		<!-- Begin: life time stats -->
+		<div class="portlet-title" >
+			<div class="caption">
+				<i class="fa fa-fire-extinguisher"></i> <span
+					class="caption-subject font-dark sbold uppercase">进出场存油量表</span>
+			</div>
+			<div class="actions">
+				<a class="btn btn-circle blue" href="add.html" data-pjax><i
+					class="fa fa-plus"></i> 添加</a>
+				<button type="button" class="btn btn-circle blue removeButton" id="removeButton">
+					<i class="fa fa-trash-o"></i> 删除
+				</button>
+				<button type="button" class="btn btn-circle blue sortButton" id="sortButton">
+					<i class="fa fa-minus-square"></i> 拆分
+				</button>
+				<button type="button" class="btn btn-circle blue saveButton" id="saveButton">
+					<i class="fa fa-check-circle"></i> 保存
+				</button>
+				<!-- <button type="button" class="btn btn-circle red" disabled="disabled" id="removeButton"><i class="fa fa-trash"></i> 删除用户</button> -->
+				<div class="btn-group">
+					<a class="btn red btn-outline btn-circle" href="javascript:;"
+						data-toggle="dropdown"> <i class="fa fa-share"></i> <span
+						class="hidden-xs"> 系统工具 </span> <i class="fa fa-angle-down"></i>
+					</a>
+					<ul class="dropdown-menu pull-right" id="datatable_ajax_tools">
+						<li><a href="javascript:;" data-action="0" class="tool-action"
+							id="obtain"> <i class="fa fa-hourglass-half"></i> 获取加/存油信息
+						</a></li>
+						<li><a href="javascript:;" data-action="1" class="tool-action"
+							id="outAndIn"> <i class="fa fa-pencil"></i> 油耗计算（进场=出场）
+						</a></li>
+						<li><a href="javascript:;" id="checkYl" data-action="3"
+							class="tool-action"> <i class="fa fa-gg-circle"></i>
+								核对加注量（有加油无里程）
+						</a></li>
+						<li class="divider"></li>
+						<li><a href="javascript:;" data-action="3" class="tool-action"
+							id="export"> <i class="fa fa-file-excel-o"></i> 导出Excel
+						</a></li>
+						
+<!-- 						<li class="divider"></li> -->
+<!-- 						<li><a href="javascript:;" data-action="3" class="tool-action" -->
+<!-- 							id="cxtj"> <i class="fa fa-file-excel-o"></i> 重新统计 -->
+<!-- 						</a></li> -->
+					</ul>
+				</div>
+			</div>
+			<div>
+				<table
+				class="table table-striped table-bordered table-hover table-checkable"
+				id="datatable_ylb" style="table-layout: fixed;margin-bottom: 0px">
+				<thead>
+					<tr role="row" class="filter">
+						<td colspan="2">
+							<div style="float: right;">&nbsp;公司&nbsp;</div>
+						</td>
+						<td colspan="3">
+							<div style="float: left; width: 150px">
+								<select class="form-control" name="ssgsdm_like"
+									id="ylbListGsdmId"></select>
+							</div>
+						</td>
+						<td colspan="2">
+							<div style="float: right;">&nbsp;分公司&nbsp;</div>
+						</td>
+						<td colspan="4">
+							<div style="float: left;">
+								<select class="form-control" name="fgsdm_like"
+									id="ylbListFgsdmId" style="width: 150px"></select>
+							</div>
+						</td>
+						<td>
+							<div style="float: right;">日期</div>
+						</td>
+						<td colspan="3">
+							<div style="float: left;">
+								<input type="text" style="width: 120px" name="rq" id="rq" />
+							</div>
+						</td>
+						<td rowspan="2" colspan="2">
+							<div style="float: left;">
+								&nbsp;
+								<button
+									class="btn btn-sm green btn-outline filter-submit margin-bottom"
+									style="margin-right: 0px">
+									<i class="fa fa-search"></i> 搜索
+								</button>
+								<!--                                 <button class="btn btn-sm red btn-outline filter-cancel" style="margin-right:0px"> -->
+								<!--                                     <i class="fa fa-times"></i> 重置 -->
+								<!--                                 </button> -->
+	
+							</div>
+						</td>
+					</tr>
+					<tr class="filter2">
+						<td colspan="2">
+							<div style="float: right;">&nbsp;线路</div>
+						</td>
+						<td colspan="3">
+							<div style="float: left;">
+								<select class="form-control" name="xlbm_like" id="xlbm"
+									style="width: 150px;"></select>
+							</div>
+						</td>
+						<td colspan="2">
+							<div style="float: right;">&nbsp;内部编码</div>
+						</td>
+						<td colspan="4">
+							<div style="float: left;">
+								<select class="form-control" name="nbbm_eq" id="nbbm"
+									style="width: 120px;"></select>
+							</div>
+							<div style="float: left;">
+								<button class="btn btn-sm #000 btn-outline filter-cancel"
+									style="margin-right: 0px">
+									<i class="fa fa-times"></i>
+								</button>
+							</div>
+						</td>
+						<td>
+							<div style="float: right;">类型</div>
+						</td>
+						<td colspan="3">
+							<div style="float: left;">
+								<select class="form-control" name="sxtj">
+									<option value="0">全部</option>
+									<option value="1">一车一单</option>
+									<option value="2">一车多单</option>
+									<option value="3">有加油没里程</option>
+									<option value="4">有里程没加油</option>
+								</select>
+							</div>
+	
+						</td>
+					</tr>
+					<tr>
+						<td colspan="17">
+							<div style="float: left;">
+								总计 &nbsp;&nbsp; 加注量:&nbsp;<label id="sumJzl"></label>
+								&nbsp;&nbsp; 耗油量:&nbsp;<label id="sumYh"></label> &nbsp;&nbsp;
+								损耗量:&nbsp;<label id="sumSh"></label>
+							</div>
+						</td>
+					</tr>
+					
+				</thead>
+	
+			</table>
+			</div>
+		</div>
+			
+		<div id="ylbtable" class="portlet-body table-container " style="height: calc(100% + 100px);overflow: hidden;position: absolute;background: #fff;">
+			
+			<table
+				class="table table-striped table-bordered table-hover table-checkable"
+				style="table-layout: fixed;margin-bottom: 0px;">
+				<thead>
+					<tr role="row" class="heading">
+						<td width="40px">
+							<input type="checkbox" id="selectAll" class="group-checkable" >
+						</td>
+						<td width="40px">序号</td>
+						<td width="8%">日期</td>
+						<td width="5%">公司</td>
+						<td width="8%">线路</td>
+						<td width="5%">自编号</td>
+						<td width="7%">驾驶员</td>
+						<td width="4%">加油量</td>
+						<td width="5%">出场存油</td>
+						<td width="5%">进场存油</td>
+						<td width="5%">油耗</td>
+						<td width="8%">燃油类型</td>
+						<td width="4%">尿素</td>
+						<td width="8%">耗损原因</td>
+						<td width="5%">耗损油量</td>
+						<td width="5%">当日总里程</td>
+						<td width="5%">数据类型</td>
+						<td >百公里油耗</td>
+					</tr>
+				</thead>
+			</table>
+			<div id="datatable_ylb_body_div" style="display: block;position:absolute;overflow: auto;height: calc(100% - 80px);">
+				<table
+				class="table table-striped table-bordered table-hover table-checkable"
+				id="datatable_ylb_body"
+				style="table-layout: fixed; overflow: auto; ">
+				<tbody></tbody>
+			</table>
+				<div style="text-align: right;margin-right: 50px">
+				<a class="btn btn-circle " href="add.html" data-pjax><i
+					class="fa fa-plus"></i> 添加</a>
+				<button type="button" class="btn btn-circle  removeButton" >
+					<i class="fa fa-trash-o"></i> 删除
+				</button>
+				<button type="button" class="btn btn-circle  sortButton">
+					<i class="fa fa-minus-square"></i> 拆分
+				</button>
+				<button type="button" class="btn btn-circle  saveButton" >
+					<i class="fa fa-check-circle"></i> 保存
+				</button>
+			</div>
+			</div>
+			
+			
+			<div style="text-align: right;">
+				<ul id="pagination" class="pagination"></ul>
+			</div>
+		</div>
+	</div>
+<script id="ylb_list_temp" type="text/html">
+    {{each list as obj i}}
+    <tr>
+        <td style="vertical-align: middle;" width="40px">
+            <input type="checkbox" name="id" class="group-checkable icheck" data-id="{{obj.id}}">
+        </td>
+		<td width="40px">{{i+1}}</td>
+        <td  width="8%">
+            {{obj.rq}}
+        </td>
+        <td width="5%">
+            {{obj.fgsname}}
+        </td>
+        <td  width="8%">
+            {{obj.xlname}}
+        </td>
+        <td width="5%">
+			<lable data-id="{{obj.id}}" class="in_carpark_nbbm">{{obj.nbbm}}</lable>
+           
+        </td>
+        <td  width="7%">
+		{{if obj.jsy=='' || obj.jsy==null }}
+			<input data-id="{{obj.id}}" style=" width:100%"  type="text"  class="in_carpark_jsy" ></input>
+			<button  class="btn btn-sm blue btn-jsyUpdate" style=" width:100%"   data-id="{{obj.id}}">填写工号</button>
+		{{else}}
+			{{obj.jsy}}/{{obj.name}}
+		{{/if}}
+            
+        </td>
+        <td width="4%">
+			<lable data-id="{{obj.id}}"  class="in_carpark_jzl"> {{obj.jzl}}</lable>
+        </td>
+        <td width="5%">
+            
+			<input data-id="{{obj.id}}" id="{{(i+1)}}_1"   href="javascript:;" class="in_carpark_czyl yl_sxzy" 
+            type="text" value=" {{obj.czyl}}" style=" width:100%" 
+onkeyup="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')"  
+            onafterpaste="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')">
+        </td>
+        <td width="5%">
+			<input data-id="{{obj.id}}" id="{{(i+1)}}_2" href="javascript:;" class="in_carpark_jzyl yl_sxzy" 
+            type="text" value=" {{obj.jzyl}}" style=" width:100%"  
+onkeyup="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')"  
+            onafterpaste="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')">
+        </td>
+        <td width="5%">
+			 
+			<input data-id="{{obj.id}}" id="{{(i+1)}}_3" href="javascript:;" class="in_carpark_yh yl_sxzy" 
+            type="text" value="{{obj.yh}}" style=" width:100%" 　readOnly="true"  />
+        </td>
+        <td width="8%"> 
+			<select data-id="{{obj.id}}" class="in_carpark_rylx"  style=" width:100%" >
+				<option value='0' {{if obj.rylx==0}}  selected = 'selected' {{/if}}>0号柴油</option> 
+				<option value='1' {{if obj.rylx==1}}  selected = 'selected' {{/if}}>负10号柴油</option> 
+			</select>
+        </td>
+        <td width="4%">
+			<input data-id="{{obj.id}}" href="javascript:;" 
+            class="in_carpark_ns yl_sxzy" id="{{(i+1)}}_4" type="text" value=" {{obj.ns}}" style=" width:100%" 
+onkeyup="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')"  
+            onafterpaste="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')">
+        </td>
+        <td width="8%">
+			<select data-id="{{obj.id}}" class="in_carpark_shyy" style=" width:100%" >
+				<option value='0' {{if obj.shyy==0}}  selected = 'selected' {{/if}}>请选择</option> 
+				<option value='1' {{if obj.shyy==1}}  selected = 'selected' {{/if}}>票务用油</option> 
+				<option value='2' {{if obj.shyy==2}}  selected = 'selected' {{/if}}>保养用油</option> 
+				<option value='3' {{if obj.shyy==3}}  selected = 'selected' {{/if}}>报废车用油</option> 
+				<option value='4' {{if obj.shyy==4}}  selected = 'selected' {{/if}}>其它用油</option> 
+				<option value='5' {{if obj.shyy==5}}  selected = 'selected' {{/if}}>人保部</option> 
+				<option value='6' {{if obj.shyy==6}}  selected = 'selected' {{/if}}>车队</option> 
+				<option value='7' {{if obj.shyy==7}}  selected = 'selected' {{/if}}>车间(高保)</option> 
+				<option value='8' {{if obj.shyy==8}}  selected = 'selected' {{/if}}>车间(小修)</option> 
+			</select>
+        </td>
+        <td width="5%">
+		<input data-id="{{obj.id}}" id="{{(i+1)}}_5" href="javascript:;" class="in_carpark_shyl yl_sxzy"
+			value={{obj.sh}} style=" width:100%" type="text" 
+onkeyup="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')"  
+            onafterpaste="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')" />
+        
+</td>
+        <td width="5%">
+            {{obj.zlc}}
+        </td>
+        <td width="5%">
+			<select data-id="{{obj.id}}" class="in_carpark_yhlx">
+				<option value='0' {{if obj.yhlx==0}}  selected = 'selected' {{/if}}>手录</option> 
+				<option value='1' {{if obj.yhlx==1}}  selected = 'selected' {{/if}}>拆分</option> 
+			</select>
+        </td>
+        <td >
+            {{obj.bglyh}}
+        </td>
+    </tr>
+    {{/each}}
+    {{if list.length == 0}}
+    <tr>
+        <td colspan=17><h6 class="muted">没有找到相关数据</h6></td>
+    </tr>
+    {{/if}}
+</script>
+
+<script>
+    $(function () {
+    	var fage=false;
+        //var id = 15;
+        //$('.in_carpark_jzyl[data-id='+id+']', '#ll_oil_list')
+		
+        
+        $("#checkYl").on('click', function () {
+            //console.log("核对加注量");
+            if ($("#rq").val() != "") {
+       		 	var params=getParamsList();
+            	$get('/ylb/checkDate',params,function(status){
+            		if(status=='2'){
+               		 layer.msg('只能操作三天内数据.');
+               		}else{
+                        var i = layer.load(2);
+                        $get('/ylb/checkYl', params, function () {
+                        	layer.close(i);
+                            jsDoQuery(params, true);
+                        });
+               		}
+            	})            	
+               
+            } else {
+                layer.msg('请选择日期.');
+            }
+        })
+
+        //进场等于出场
+        $("#outAndIn").on('click', function () {
+           // console.log("进场油量等于出场油量");
+            if ($("#rq").val() != "") {
+            	var params=getParamsList();
+            	$get('/ylb/checkDate',params,function(status){
+            		if(status=='2'){
+               		 layer.msg('只能操作三天内数据.');
+               		}else{
+		                var i = layer.load(2);
+		                $get('/ylb/outAndIn', params, function () {
+		                	layer.close(i);
+		                    jsDoQuery(params, true);
+		                });
+               		}
+            	})
+            } else {
+                layer.msg('请选择日期.');
+            }
+        });
+       
+        //保存
+        $(".saveButton").on('click',function(){
+        	
+        	var params_=getParamsList();
+        	$get('/ylb/checkDate',params_,function(status){
+        		if(status=='2'){
+           		 layer.msg('只能操作三天内数据.');
+           		}else{
+		        	var ylArray = [];
+		        	$('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;
+		        		}
+		        		var czyl=$('.in_carpark_czyl[data-id='+id+']', '#ll_oil_list').val();
+		        		if(czyl=="" || czyl==null){
+		        			czyl=0;
+		        		}
+		        		var jzyl=$('.in_carpark_jzyl[data-id='+id+']', '#ll_oil_list').val();
+		        		if(jzyl=="" || jzyl==null){
+		        			jzyl=0;
+		        		}
+		        		
+		        		var sh =  $('.in_carpark_shyl[data-id='+id+']', '#ll_oil_list').val();
+		        		if(sh=="" || sh==null){
+		        			sh=0;
+		        		}
+		        		
+		                var shyy =  $('.in_carpark_shyy[data-id='+id+']', '#ll_oil_list').val();
+		                var ns =  $('.in_carpark_ns[data-id='+id+']', '#ll_oil_list').val();
+		                if(ns=="" || ns==null){
+		                	ns=0;
+		        		}
+		                
+		                var rylx= $('.in_carpark_rylx[data-id='+id+']', '#ll_oil_list').val();
+		                var yhlx = $('.in_carpark_yhlx[data-id='+id+']', '#ll_oil_list').val();
+		                
+		                map['id']=id;
+		                map['jzl']=jzl;
+		                map['czyl']=czyl;
+		                map['jzyl']=jzyl;
+		                map['sh']=sh;
+		                map['shyy']=shyy;
+		                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);
+		        	 var i = layer.load(2);
+		        	  $post('/ylb/saveYlbList', params, function () {
+		             	layer.close(i);
+		             	var params1 =getParamsList();
+		                 jsDoQuery(params1, true);
+		             }); 
+        		}
+        	})
+        })
+        //拆分
+        $(".sortButton").on('click', function () {
+            if ($("#rq").val() != "") {
+            	var params_=getParamsList();
+            	$get('/ylb/checkDate',params_,function(status){
+            		if(status=='2'){
+               		 layer.msg('只能操作三天内数据.');
+               	}else{
+	            	//拆分前先保存全部  
+	            	var ylArray = [];
+		        	$('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;
+		        		}
+		        		var czyl=$('.in_carpark_czyl[data-id='+id+']', '#ll_oil_list').val();
+		        		if(czyl=="" || czyl==null){
+		        			czyl=0;
+		        		}
+		        		var jzyl=$('.in_carpark_jzyl[data-id='+id+']', '#ll_oil_list').val();
+		        		if(jzyl=="" || jzyl==null){
+		        			jzyl=0;
+		        		}
+		        		
+		        		var sh =  $('.in_carpark_shyl[data-id='+id+']', '#ll_oil_list').val();
+		        		if(sh=="" || sh==null){
+		        			sh=0;
+		        		}
+		        		
+		                var shyy =  $('.in_carpark_shyy[data-id='+id+']', '#ll_oil_list').val();
+		                var ns =  $('.in_carpark_ns[data-id='+id+']', '#ll_oil_list').val();
+		                if(ns=="" || ns==null){
+		                	ns=0;
+		        		}
+		                
+		                var rylx= $('.in_carpark_rylx[data-id='+id+']', '#ll_oil_list').val();
+		                var yhlx = $('.in_carpark_yhlx[data-id='+id+']', '#ll_oil_list').val();
+		                
+		                map['id']=id;
+		                map['jzl']=jzl;
+		                map['czyl']=czyl;
+		                map['jzyl']=jzyl;
+		                map['sh']=sh;
+		                map['shyy']=shyy;
+		                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);
+	        	  
+	            	
+	            	//拆分操作
+	            	var ylArray2 = [];
+	            	var nbbm="";
+	            	var msg="";
+	            	 $('input.icheck:checked').each(function(){
+	            		 var map = {};
+		             		var id=$(this).data('id');
+		             		var clzbh =$('.in_carpark_nbbm[data-id='+id+']', '#ll_oil_list').html();
+		             		if(nbbm.indexOf(clzbh)>-1){
+		             			if(msg==""){
+		             				msg += clzbh;
+		             			}else{
+		             				msg += ","+clzbh;
+		             			}
+		             		}else{
+		             			nbbm +=clzbh;
+		             			var jzyl=$('.in_carpark_jzyl[data-id='+id+']', '#ll_oil_list').val();
+		                 		var sh =  $('.in_carpark_shyl[data-id='+id+']', '#ll_oil_list').val();
+		                        var shyy =  $('.in_carpark_shyy[data-id='+id+']', '#ll_oil_list').val();
+		                        var ns =  $('.in_carpark_ns[data-id='+id+']', '#ll_oil_list').val();
+		                        var rylx= $('.in_carpark_rylx[data-id='+id+']', '#ll_oil_list').val();
+		                        map['id']=id;
+		                        map['jzyl']=jzyl;
+		                        map['sh']=sh;
+		                        map['shyy']=shyy;
+		                        map['ns']=ns;
+		                        map['rylx']=rylx;
+		                        ylArray2.push(map);
+		             		}
+	             		
+		            	}) ;
+		            	 if(msg!=""){
+		            		 layer.msg('内部编码为:【'+msg +'】的车辆请选择一条数据进行拆分.');
+		            	 }else{
+		            		 var params2 = {};
+		             		params2['ylbList']=JSON.stringify(ylArray2);
+		             		 var i = layer.load(2);
+		             		//保存操作
+		               	 	 $post('/ylb/saveYlbList', params, function () {
+		               	 		 //拆分操作
+			                     $post('/ylb/sort', params2, function () {
+			                     	layer.close(i);
+			                     	var params1 =getParamsList();
+			                         jsDoQuery(params1, true);
+			                     }); 
+		               	 	});
+		            	 }
+            		}
+            	})
+            } else {
+                layer.msg('请选择日期.');
+            }
+            
+            
+        })
+        
+        /* //拆分
+        $("#sortButton").on('click', function () {
+            if ($("#rq").val() != "") {
+            	var ylArray = [];
+            	var nbbm="";
+            	var msg="";
+            	 $('input.icheck:checked').each(function(){
+            		 var map = {};
+             		var id=$(this).data('id');
+             		var clzbh =$('.in_carpark_nbbm[data-id='+id+']', '#ll_oil_list').html();
+             		if(nbbm.indexOf(clzbh)>-1){
+             			if(msg==""){
+             				msg += clzbh;
+             			}else{
+             				msg += ","+clzbh;
+             			}
+             		}else{
+             			nbbm +=clzbh;
+             			var jzyl=$('.in_carpark_jzyl[data-id='+id+']', '#ll_oil_list').val();
+                 		var sh =  $('.in_carpark_shyl[data-id='+id+']', '#ll_oil_list').val();
+                        var shyy =  $('.in_carpark_shyy[data-id='+id+']', '#ll_oil_list').val();
+                        var ns =  $('.in_carpark_ns[data-id='+id+']', '#ll_oil_list').val();
+                        var rylx= $('.in_carpark_rylx[data-id='+id+']', '#ll_oil_list').val();
+                        map['id']=id;
+                        map['jzyl']=jzyl;
+                        map['sh']=sh;
+                        map['shyy']=shyy;
+                        map['ns']=ns;
+                        map['rylx']=rylx;
+                        ylArray.push(map);
+             		}
+             		
+            	}) ;
+            	 if(msg!=""){
+            		 layer.msg('内部编码为:【'+msg +'】的车辆请选择一条数据进行拆分.');
+            	 }else{
+            		 var params = {};
+             		params['ylbList']=JSON.stringify(ylArray);
+             		 var i = layer.load(2);
+                     $post('/ylb/sort', params, function () {
+                     	layer.close(i);
+                     	var params1 =getParamsList();
+                         jsDoQuery(params1, true);
+                     }); 
+             		
+            	 }
+            	
+            } else {
+                layer.msg('请选择日期.');
+            }
+        }) */
+        //获取加存信息
+        $("#obtain").on('click', function () {
+            //console.log("获取加存");
+            if ($("#rq").val() != "") {
+            	var params=getParamsList();
+            	$get('/ylb/checkDate',params,function(status){
+	            	if(status=='2'){
+	               		 layer.msg('只能操作三天内数据.');
+	               	}else{
+		                var i = layer.load(2);
+		                $get('/ylb/obtain', params, function () {
+		                	layer.close(i);
+		                    jsDoQuery(params, true);
+		                });
+	            	}
+            	})
+            } else {
+                layer.msg('请选择日期.');
+            }
+
+        })
+        $("#rq").datetimepicker({
+            format: 'YYYY-MM-DD',
+            locale: 'zh-cn'
+        });
+
+        var page = 0, initPagination;
+        var icheckOptions = {
+            radioClass: 'icheckbox_flat-blue',
+            increaseArea: '20%'
+        }
+
+        //重置
+        $('tr.filter2 .filter-cancel').on('click', function () {
+            $('tr.filter2 , #nbbm').val('').change();
+        });
+
+        //提交
+        $('tr.filter .filter-submit').on('click', function () {
+        	 var ylbGsdm=$("#ylbListGsdmId").val();
+     		var ylbFgsdm=$("#ylbListFgsdmId").val();
+            if ($("#rq").val() == "" || $("#rq").val() ==null){
+            	  layer.msg('请选择日期.');
+            }else if(ylbGsdm=="" || ylbGsdm==null || ylbFgsdm=="" ||ylbFgsdm==null){
+            	 layer.msg('请选择公司和分公司.');
+            }else {
+            	 var params = getParamsList();
+                page = 0;
+                jsDoQuery(params, true);
+            } 
+        });
+        
+      
+    	var xlList;
+    	var obj=[];
+		$.get('/report/lineList',function(result){
+			xlList=result;
+	    	$.get('/user/companyData', function(result){
+	    		obj = result;
+	    		var options="";
+	    		for(var i = 0; i < obj.length; i++){
+	    			options += '<option value="'+obj[i].companyCode+'">'+obj[i].companyName+'</option>';
+	    		}
+	    		$('#ylbListGsdmId').html(options);
+	    		updateCompany();
+	    	});
+		})
+    	$("#ylbListGsdmId").on("change",updateCompany);
+    	function updateCompany(){
+    		var company = $('#ylbListGsdmId').val();
+    		var options ="";
+    		for(var i = 0; i < obj.length; i++){
+    			if(obj[i].companyCode == company){
+    				var children = obj[i].children;
+    				for(var j = 0; j < children.length; j++){
+    					options += '<option value="'+children[j].code+'">'+children[j].name+'</option>';
+    				}
+    			}
+    		}
+    		$('#ylbListFgsdmId').html(options);
+    		initXl();
+    		initCl();
+    	}
+        /*
+         * 获取数据 p: 要提交的参数， pagination: 是否重新分页
+         */
+        var moveArray=new Array();     //存放文本框数组 
+        function jsDoQuery(p, pagination) {
+            var params = {};
+            if (p)
+                params = p;
+            //更新时间排序
+            params['order'] = 'nbbm';
+            params['page'] = page;
+            params['rq'] = $("#rq").val();
+   		 	
+            var l = layer.load(2);
+            $get('/ylb/ylbList', params, function (data) {
+            	for(var i=1;i<data.length;i++){  
+        	        moveArray[i]=new Array();  
+        	        for(var j=1;j<6;j++){  
+        	            moveArray[i][j]=i+"_"+j;  
+        	        }  
+        	    }  
+                $.each(data, function (i, obj) {
+                    obj.rq = moment(obj.rq).format("YYYY-MM-DD");
+                });
+                var bodyHtm = template('ylb_list_temp', {list:data});
+               
+                $('#datatable_ylb_body tbody').html(bodyHtm);
+                $('.btn-jsyUpdate').on('click', jsyUpdate);
+                $('.yl_sxzy').on('mouseup', yhSxzy);
+                layer.close(l);
+            	$get('/ylb/sumYlb',params,function(returns){
+            		$("#sumJzl").html(returns.jzl);
+            		$("#sumYh").html(returns.yh);
+            		$("#sumSh").html(returns.sh);
+        		});
+            	 $('input').on('input propertychange',function(){
+                 	var id=$(this).data('id');
+                 	var jzl =$('.in_carpark_jzl[data-id='+id+']', '#ll_oil_list').html();
+            		if(jzl=="" || jzl ==null){
+            			jzl=0;
+            		}
+            		var czyl=$('.in_carpark_czyl[data-id='+id+']', '#ll_oil_list').val();
+            		if(czyl=="" || czyl==null){
+            			czyl=0;
+            		}
+            		var jzyl=$('.in_carpark_jzyl[data-id='+id+']', '#ll_oil_list').val();
+            		if(jzyl=="" || jzyl==null){
+            			jzyl=0;
+            		}
+            		
+            		var sh =  $('.in_carpark_shyl[data-id='+id+']', '#ll_oil_list').val();
+            		if(sh=="" || sh==null){
+            			sh=0;
+            		}
+            		var addNum=accAdd(jzl,czyl);
+            		var subNum=jzyl;
+            		var sub=numSubtr(addNum*1000,subNum*1000);
+            		var subValue=0;
+            		if(sub/1000>=0){
+            			subValue=sub/1000;
+            		}
+            		$('.in_carpark_yh[data-id='+id+']', '#ll_oil_list').val(subValue);
+            		
+                 });
+                 $('#datatable_ylb_body_div').animate({scrollTop: '0px'}, 800);
+            });
+        }
+		
+        
+        function jsyUpdate(){
+        	var params=getParamsList();
+        	$get('/ylb/checkDate',params,function(status){
+	            if(status=='2'){
+	               	layer.msg('只能操作三天内数据.');
+	            }else{
+					var id = $(this).data('id');
+		    		var jsy=$('.in_carpark_jsy[data-id='+id+']', '#ll_oil_list').val();
+		    		$get('/ylb/updateJsy',{id:id,jsy:jsy}, function(result){
+						layer.msg('修改成功.');
+		                page = 0;
+		                jsDoQuery(params, true);
+					});
+	        	}
+        	})
+
+		}
+		//页面计算防止精度丢失
+		var accAdd = function (a, b) {
+	        var c, d, e;
+	        try {
+	            c = a.toString().split(".")[1].length;
+	        } catch (f) {
+	            c = 0;
+	        }
+	        try {
+	            d = b.toString().split(".")[1].length;
+	        } catch (f) {
+	            d = 0;
+	        }
+	        return e = Math.pow(10, Math.max(c, d)), (mul(a, e) + mul(b, e)) / e;
+	    };
+
+	    var numSubtr = function (a, b) {
+	        var c, d, e;
+	        try {
+	            c = a.toString().split(".")[1].length;
+	        } catch (f) {
+	            c = 0;
+	        }
+	        try {
+	            d = b.toString().split(".")[1].length;
+	        } catch (f) {
+	            d = 0;
+	        }
+	        return e = Math.pow(10, Math.max(c, d)), (a * e - b * e) / e;
+	    };
+	    
+	    function mul(a, b) {
+	        var c = 0,
+	            d = a.toString(),
+	            e = b.toString();
+	        try {
+	            c += d.split(".")[1].length;
+	        } catch (f) {
+	        }
+	        try {
+	            c += e.split(".")[1].length;
+	        } catch (f) {
+	        }
+	        return Number(d.replace(".", "")) * Number(e.replace(".", "")) / Math.pow(10, c);
+	    }
+        //改变状态
+        function startOptJzylLink(es) {
+            es.editable({
+                type: 'text',
+                placement: 'right',
+                width: 100,
+                display: false,
+                validate: function (value) {
+                    if (!value)
+                        return '值不能为空！';
+                    if (isNaN(value))
+                        return '只能为数字！';
+                    if (value < 0)
+                        return '值不能小于0！';
+                },
+                inputclass: 'form-control input-medium input-edtable-sm'
+            })
+                    .on('save', function (e, params) {
+                        $(this).text(params.newValue);
+                    });
+        }
+
+        //改变状态
+        function startOptShylLink(es) {
+            es.editable({
+                type: 'text',
+                placement: 'right',
+                width: 100,
+                display: false,
+                validate: function (value) {
+                    if (!value)
+                        return '值不能为空！';
+                    if (isNaN(value))
+                        return '只能为数字！';
+                    if (value < 0)
+                        return '值不能小于0！';
+                },
+                inputclass: 'form-control input-medium input-edtable-sm'
+            })
+                    .on('save', function (e, params) {
+                        $(this).text(params.newValue);
+                    });
+        }
+        function iCheckChange() {
+            var tr = $(this).parents('tr');
+            if (this.checked)
+                tr.addClass('row-active');
+            else
+                tr.removeClass('row-active');
+        }
+
+        function showPagination(data) {
+            //分页
+            $('#pagination').jqPaginator({
+                totalPages: data.totalPages,
+                visiblePages: 6,
+                currentPage: page + 1,
+                first: '<li class="first"><a href="javascript:void(0);">首页<\/a><\/li>',
+                prev: '<li class="prev"><a href="javascript:void(0);">上一页<\/a><\/li>',
+                next: '<li class="next"><a href="javascript:void(0);">下一页<\/a><\/li>',
+                last: '<li class="last"><a href="javascript:void(0);">尾页<\/a><\/li>',
+                page: '<li class="page"><a href="javascript:void(0);">{{page}}<\/a><\/li>',
+                onPageChange: function (num, type) {
+                    if (initPagination) {
+                        initPagination = false;
+                        return;
+                    }
+
+                    var params=getParamsList();
+                    page = num - 1;
+                    jsDoQuery(params, true);
+                }
+            });
+        }
+
+        //删除
+        $('.removeButton').on('click', function () {
+        	var params_=getParamsList();
+        	$get('/ylb/checkDate',params_,function(status){
+		            if(status=='2'){
+		               	layer.msg('只能操作三天内数据.');
+		            }else{
+		        	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{
+			            if(confirm('确定要删除选中的数据？')) 
+			            { 
+			            	 var i = layer.load(2);
+			            	 $post('/ylb/deleteIds', params, function (result) {
+			            		 layer.close(i);
+			            		 var params=getParamsList();
+				            	  jsDoQuery(params, true);
+			                 });
+			            } 
+			       	 }
+	        	}
+        	})
+        });
+		
+		$("#ylbListFgsdmId").on("change",initXl);
+		function initXl(){
+			var data=[];
+			data.push({id: " ", text: "全部线路"});
+			if(fage){
+				$("#xlbm").select2("destroy").html('');
+			}
+			var fgs=$('#ylbListFgsdmId').val();
+			var gs=$('#ylbListGsdmId').val();
+			for(var i=0;i<xlList.length;i++){
+				if(gs!=""){
+					if(fgs!=""){
+						if(xlList[i]["fgsbm"]==fgs && xlList[i]["gsbm"]==gs){
+							data.push({id: xlList[i]["xlbm"], text: xlList[i]["xlname"]});
+						}
+					}else{
+						if(xlList[i]["gsbm"]==gs){
+							data.push({id: xlList[i]["xlbm"], text: xlList[i]["xlname"]});
+						}
+					}
+				}
+			}
+			initPinYinSelect2('#xlbm',data,'');
+			fage=true;
+		}
+
+	$("#xlbm").on("change",initCl);
+        	function initCl(){
+	        	$('#nbbm').select2({
+	                placeholder: '搜索车辆...',
+	                ajax: {
+	                    url: '/report/carList',
+	                    dataType: 'json',
+	                    delay: 150,
+	                    data: function (params) {
+	                        return {nbbm: params.term,
+	                        	    gsbm:$('#ylbListGsdmId').val(),
+	                        	    fgsbm:$('#ylbListFgsdmId').val(),
+	                        	    xlbm:$('#xlbm').val()};
+	                    },
+	                    processResults: function (data) {
+	                        return {
+	                            results: data
+	                        };
+	                    },
+	                    cache: true
+	                },
+	                templateResult: function (repo) {
+	                    if (repo.loading) return repo.text;
+	                    var h = '<span>' + repo.text + '</span>';
+	                    h += (repo.lineName ? '&nbsp;<span class="select2-desc">' + repo.lineName + '</span>' : '');
+	                    return h;
+	                },
+	                escapeMarkup: function (markup) {
+	                    return markup;
+	                },
+	                minimumInputLength: 1,
+	                templateSelection: function (repo) {
+	                    return repo.text;
+	                },
+	                language: {
+	                    noResults: function () {
+	                        return '<span style="color:red;font-size: 12px;">没有搜索到车辆！</span>';
+	                    },
+	                    inputTooShort: function (e) {
+	                        return '<span style="color:gray;font-size: 12px;"><i class="fa fa-search"></i> 输入自编号搜索车辆</span>';
+	                    },
+	                    searching: function () {
+	                        return '<span style="color:gray;font-size: 12px;"> 正在搜索车辆...</span>';
+	                    }
+	                }
+	            });
+        	
+        	}
+//         }
+    
+        	 $("#cxtj").on("click", function () {
+                 if ($("#rq").val() != "") {
+//      				 var params=getParamsList();
+                     $post('/ylb/updateHistory', {date:'2017-11-07',line:'10708',gsdm:'26',fgsdm:'1'}, function (result) {
+                         window.open("/downloadFile/download?fileName="+$("#rq").val()+"进出场存油量" );
+                     });
+                 } else {
+                     layer.msg('请选择日期.');
+                 }
+             });
+        
+//导出
+
+        $("#export").on("click", function () {
+            if ($("#rq").val() != "") {
+				 var params=getParamsList();
+                $post('/ylb/listExport', params, function (result) {
+                    window.open("/downloadFile/download?fileName="+$("#rq").val()+"进出场存油量" );
+                });
+            } else {
+                layer.msg('请选择日期.');
+            }
+        });
+        
+        function checkDate(){
+        	var params=getParamsList();
+        	
+        }
+
+        function getParamsList(){
+        	  var cells = $('tr.filter')[0].cells
+              , cells1 = $('tr.filter2')[0].cells,params = {}
+              , name;
+        	 $.each(cells, function (i, cell) {
+                 var items = $('input,select', cell);
+                 for (var j = 0, item; item = items[j++];) {
+                     name = $(item).attr('name');
+                     if (name) {
+                         params[name] = $(item).val();
+                     }
+                 }
+             });
+             $.each(cells1, function (i, cell) {
+                 var items = $('input,select', cell);
+                 for (var j = 0, item; item = items[j++];) {
+                     name = $(item).attr('name');
+                     if (name) {
+                         params[name] = $(item).val();
+                     }
+                 }
+             });
+        	
+             return params;
+        }
+        
+        //表格滚动条
+		var modal='#ylbtable';
+        $('#datatable_ylb_body_div', modal).perfectScrollbar({suppressScrollX: true});
+        
+        //全选 全不选
+        $("#selectAll").on("click", function () {
+ 			if ($(this).is(":checked")) {
+                    $("[name=id]:checkbox").prop("checked", true);
+//                     $("input[name='id']").attr('checked', true)
+                } else {
+                    $("[name=id]:checkbox").prop("checked", false);
+//                     $("input[name='id']").attr('checked', false);
+                }
+		});
+        
+		
+        //键盘上下左右移动
+		 var mouseInfo={};      //存放鼠标的当前位置  
+		function yhSxzy(){
+			tdid=$(this).attr('id');
+			var rc=tdid.split("_");
+			mouseInfo["row"]=rc[0];  
+			mouseInfo["col"]=rc[1];  
+		}
+	    
+	    document.body.onkeydown=function(e){  //监听鼠标操作  
+	          e=window.event||e;  
+	          switch(e.keyCode){  
+	            case 37: //左键  
+	              moveLeft();  
+	              break;  
+	            case 38: //向上键  
+	              moveUp();  
+	              break;  
+	            case 39: //右键  
+	              moveRight();  
+	              break;  
+	            case 40: //向下键  
+	              moveDown();  
+	              break;  
+	            default:  
+	              break;  
+	          }  
+	        }  
+	    
+	    function moveLeft(){    
+	        var row=mouseInfo["row"];  
+	        var col=mouseInfo["col"];  
+	          
+	        var key=moveArray[row][col-1];  
+	        if(document.getElementById(key)!=undefined)  
+	        {  
+	            var textFiled=document.getElementById(key);  
+	            textFiled.focus(false, 1000);  
+	            textFiled.select();  
+	            mouseInfo["col"]=parseInt(col)-1;  
+	        }  
+	      
+	    }  
+	    function moveRight(){  
+	        var row=mouseInfo["row"];  
+	        var col=mouseInfo["col"];  
+	          
+	        var key=moveArray[row][parseInt(col)+1];  
+	        if(document.getElementById(key)!=undefined)  
+	        {  
+	            var textFiled=document.getElementById(key);  
+	            textFiled.focus(false, 1000);  
+	            textFiled.select();  
+	            mouseInfo["col"]=parseInt(col)+1;  
+	        }  
+	    }  
+	    function moveUp(){  
+	        var row=mouseInfo["row"];  
+	        var col=mouseInfo["col"];  
+	          
+	        var key=moveArray[parseInt(row)-1][col]; 
+	        if(document.getElementById(key)!=undefined)  
+	        {  
+	            var textFiled=document.getElementById(key);  
+	            textFiled.focus(false, 1000);  
+	            textFiled.select();  
+	            mouseInfo["row"]=parseInt(row)-1;  
+	        }     
+	    }  
+	    function moveDown(){  
+	        var row=mouseInfo["row"];  
+	        var col=mouseInfo["col"]; 
+	        var key=moveArray[parseInt(row)+1][col]; 
+	        if(document.getElementById(key)!=undefined)  
+	        {  
+	            var textFiled=document.getElementById(key);  
+	            textFiled.focus(false, 1000);  
+	            textFiled.select();  
+	            mouseInfo["row"]=parseInt(row)+1;  
+	        }     
+	    }  
+
+    });
+</script>