车卡不符添加分公司查询

事后修改路单自动计算油账

车卡不符添加分公司查询
事后修改路单自动计算油账
廖磊
1 parent 62a338a8
Showing 9 changed files with 580 additions and 312 deletions
src/main/java/com/bsth/controller/oil/YlbController.java
src/main/java/com/bsth/entity/oil/YlxxbUpdate.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/java/com/bsth/service/oil/impl/YlxxbServiceImpl.java
src/main/resources/static/pages/oil/checkNbbmList.html
src/main/resources/static/pages/oil/list_ph.html
@@ -288,4 +288,22 @@ public class YlbController extends BaseController&lt;Ylb, Integer&gt;{
 		return resList;
 	}
+	
+	/*
+	 *   历史修改行车路单后重新统计油量信息  (传参：line --线路编码   date --日期)
+	 */
+	
+	@RequestMapping(value = "/updateHistory",method = RequestMethod.POST)
+	public Map<String, Object> updateHistory(@RequestParam Map<String, Object> map) throws Exception{
+		Map<String, Object> list =new HashMap<String, Object>();
+		try {
+			list = yblService.updateHistory(map);
+		} catch (Exception e) {
+			// TODO Auto-generated catch block
+			throw e;
+		}
+		return list;
+	}
+	
+	
 }
@@ -31,6 +31,7 @@ public class YlxxbUpdate {
 	private Date xgrq;
 	private String xgr;
 	private String tj;
+	private Integer zt;
 	public Integer getId() {
 		return id;
 	}
@@ -103,8 +104,11 @@ public class YlxxbUpdate {
 	public void setTj(String tj) {
 		this.tj = tj;
 	}
-	
-	
-	
+	public Integer getZt() {
+		return zt;
+	}
+	public void setZt(Integer zt) {
+		this.zt = zt;
+	}
 }
@@ -26,6 +26,8 @@ public interface DlbService extends BaseService&lt;Dlb, Integer&gt;{
 	Map<String, Object> saveDlb(Dlb t);
 	Map<String, Object> deleteIds(Map<String, Object> map) throws Exception;
-
+	
+	Map<String, List<Dlb>> updeteHistory(List<Map<String, Object>>  list,String date,
+		String gsdm,String fgsdm,String line) ;
 }
@@ -25,4 +25,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;
+
+	
 }
@@ -214,181 +214,6 @@ public class DlbServiceImpl extends BaseServiceImpl&lt;Dlb,Integer&gt; implements DlbS
 		}
 		return result;
 	}
-	/**
-	 * 获取进存电信息
-	 * @Transactional 回滚事物
-	 */
-	/*@Transactional  
-	@Override
-	public Map<String, Object> obtain(Map<String, Object> map2) {
-		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 gsbm="";
-			if(map2.get("ssgsdm_like")!=null){
-				gsbm=map2.get("ssgsdm_like").toString();
-			}
-			
-			String nbbm="";
-			if(map2.get("nbbm_eq")!=null){
-				nbbm=map2.get("nbbm_eq").toString();
-			}
-			String fgsbm="";
-			if(map2.get("fgsdm_like")!=null){
-				fgsbm=map2.get("fgsdm_like").toString();
-			}
-				
-		String rq=map2.get("rq").toString();
-		String line="";
-		if(map2.get("xlbm_eq")!=null){
-			line=map2.get("xlbm_eq").toString();
-		}
-		
-		SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
-		//保留两位小数
-		DecimalFormat df = new DecimalFormat("#.00");
-		// TODO Auto-generated method stub
-		Map<String, Object> newMap=new HashMap<String,Object>();
-		//当天DLB信息
-		List<Dlb> dlList=repository.obtainDl(rq, gsbm, fgsbm, line, nbbm, "nbbm");
-		//当天YLXXB信息
-		List<Ylxxb> ylxxList=ylxxbRepository.obtainYlxx(rq,1,gsbm);
-		//当天加电信息表
-		List<Jdl> jdlList=jdlRepository.JdlList(rq);
-		//前一天所有车辆最后进场班次信息
-		List<Dlb> dlListBe=repository.obtainYlbefore(rq, gsbm, fgsbm, line, nbbm);
-		List<Cdl> cdyList=cdlRepository.obtainCdl();
-		//从排班表中计算出行驶的总里程
-		List<Map<String,Object>> listpb=scheduleRealInfoService.yesterdayDataList(line, rq, gsbm, fgsbm, "", nbbm);
-		List<Dlb> addList=new ArrayList<Dlb>();
-		List<Dlb> updateList=new ArrayList<Dlb>();
-		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) {
-				 sfdc= carsMap.get(map.get("clZbh").toString());
-			}else{
-				sfdc=false;
-			}
-			if(sfdc){
-				//判断驾驶员驾驶的该车辆是否已经存入了（查出的结果集中日期是相同的，根据驾驶员、内部编号、线路编码判断）
-				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()))
-					{
-						t=t1;
-						type="update";
-					}
-				}
-				try {
-					//当日的第一个班次，出场油量等于前一天的最后一个班次的进场油量
-					Double jzl=0.0;
-					if(map.get("seqNumber").toString().equals("1")){
-						boolean fage=true;
-						for (int i = 0; i < dlListBe.size(); i++) {
-							Dlb dlb=dlListBe.get(i);
-							if(map.get("clZbh").toString().equals(dlb.getNbbm())){
-								t.setCzcd(dlb.getJzcd());
-								fage=false;
-								break;
-							}
-						}
-						if(fage){
-							for (int y = 0; y < cdyList.size(); y++) {
-								Cdl cdl=cdyList.get(y);
-								if(map.get("clZbh").toString().equals(cdl.getNbbm())){
-									t.setCzcd(cdl.getClcd()==null?0:cdl.getClcd());
-									fage=false;
-									break;
-								}
-							}
-						}
-						if(fage){
-							t.setCzcd(0.0);
-						}
-						
-						//
-						for (int i = 0; i < jdlList.size(); i++) {
-							Jdl jdl=jdlList.get(i);
-							if(map.get("clZbh").toString().equals(jdl.getNbbm()) 
-									&&map.get("jGh").toString().equals(jdl.getJsy())
-									&&map.get("bCompany").toString().equals(jdl.getFgsBm())){
-								jzl+=jdl.getJdl();
-							}
-						}
-					}
-					
-					
-					//把当天的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+=ylxxb.getJzl();
-						}
-					}
-					
-					t.setCdl(jzl);
-//					if(type.equals("add")){
-						t.setHd(jzl);
-						t.setJzcd(t.getCzcd());
-//					}
-					
-					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(df.format(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.setCreatetime(new Date());
-					if(type.equals("add")){
-						addList.add(t);
-					}else{
-						updateList.add(t);
-					}
-					newMap.put("status", ResponseCode.SUCCESS);
-				} catch (ParseException e) {
-					// TODO Auto-generated catch block
-					newMap.put("status", ResponseCode.ERROR);
-					e.printStackTrace();
-				}
-			}
-		}
-		try {
-			if(addList.size()>0){
-				try{
-				new BatchSaveUtils<Dlb>().saveList(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));
-				}
-			}
-			newMap.put("status", ResponseCode.SUCCESS);
-		}
-		catch (Exception e) {
-			// TODO: handle exception
-			newMap.put("status", ResponseCode.ERROR);
-		}
-		return newMap;
-	}*/
 	/**
 	 * 获取进存油信息
@@ -640,6 +465,7 @@ public class DlbServiceImpl extends BaseServiceImpl&lt;Dlb,Integer&gt; implements DlbS
 								t.setJhsj(map.get("fcsj")==null?"":map.get("fcsj").toString());
 								t.setRq(sdf.parse(rq));
 								t.setLp(map.get("lpName").toString());
+								 t.setCdl(Arith.add(t.getCdl(), t.getSh()));
 								 if(!(t.getSsgsdm().equals("") || t.getFgsdm().equals(""))){
 									 if(type.equals("add")){
 										 t.setCreatetime(date);
@@ -649,7 +475,6 @@ public class DlbServiceImpl extends BaseServiceImpl&lt;Dlb,Integer&gt; implements DlbS
 									     updateList.add(t); 
 									  }
 								 }
-								 t.setCdl(Arith.add(t.getCdl(), t.getSh()));
 								newMap.put("status", ResponseCode.SUCCESS);
 							}
 						}
@@ -1143,6 +968,208 @@ public class DlbServiceImpl extends BaseServiceImpl&lt;Dlb,Integer&gt; implements DlbS
 		}
 		return maps;
 	}
+
+	@Override
+	public Map<String, List<Dlb>> updeteHistory(List<Map<String, Object>> listpbDc,String date,
+			String gsdm,String fgsdm,String line) {
+		// TODO Auto-generated method stub
+		Map<String, List<Dlb>> mapList=new HashMap<String,List<Dlb>>();
+		 SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
+		// 保留两位小数
+		DecimalFormat df = new DecimalFormat("#.00");
+		List<Dlb> dlbList=this.listOrderBy(date,gsdm,fgsdm,line,"","nbbm");
+		List<Dlb> dlbList_upd=new ArrayList<Dlb>(); 
+		List<Dlb> dlbList_del=new ArrayList<Dlb>(); 
+		try{
+		for (int j = 0; j < dlbList.size(); j++) {
+			Dlb t=dlbList.get(j);
+			boolean fage=true;
+			for (int i = 0; i < listpbDc.size(); i++) {
+				Map<String, Object> m = listpbDc.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;
+					dlbList_upd.add(t);
+				}
+			}
+			if(fage){
+				dlbList_del.add(t);
+			}
+		}
+		mapList.put("delList", dlbList_del);
+		Map<String, Double> lcMap=new HashMap<String,Double>();
+		for (int i = 0; i < listpbDc.size(); i++) {
+			String cl=listpbDc.get(i).get("clZbh").toString();
+			Double lc= listpbDc.get(i).get("totalKilometers") == null ? 0.0
+					: Double.parseDouble(listpbDc.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_));
+			}
+		}
+		Map<String, Double> shMap=new HashMap<String,Double>();
+		for (int i = 0; i < dlbList_upd.size(); i++) {
+			Dlb dlb=dlbList_upd.get(i);
+			String cl=dlb.getNbbm();
+			if(shMap.get(cl)==null){
+				shMap.put(cl, dlb.getSh());
+			}else{
+				double sh=shMap.get(cl);
+				shMap.remove(cl);
+				shMap.put(cl, Arith.add(sh, dlb.getSh()));
+			}
+		}
+		List<Jdl> jdlList=jdlRepository.JdlList(date);
+		List<Ylxxb> ylxxList = ylxxbRepository.obtainYlxx(date, 0,gsdm);
+		Map<String, Object> newMap_=new HashMap<String,Object>();
+		Map<String, Object> cMap=new HashMap<String, Object>();
+		List<Map<String, Object>> listpb_=listpbDc;
+		Collections.sort(listpbDc,new NbbmJcsxMap());
+		List<Dlb> updateDlb=new ArrayList<Dlb>();
+		for (int x = 0; x < listpb_.size(); x++) {
+			String type = "add";
+			Map<String, Object> map_ = listpb_.get(x);
+				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 < listpbDc.size(); i++) {
+						Map<String, Object> map = listpbDc.get(i);
+						if(map_.get("clZbh").toString().equals(map.get("clZbh").toString())){
+							// 判断驾驶员驾驶的该车辆是否已经存入了（查出的结果集中日期是相同的，根据驾驶员、内部编号、线路编码判断）
+							Dlb t = new Dlb();
+							for (int k = 0; k < dlbList_upd.size(); k++) {
+								Dlb t1 = dlbList_upd.get(k);
+								if (t1.getNbbm().equals(map.get("clZbh").toString())
+										&& t1.getJsy().equals(map.get("jGh").toString())
+										&& t1.getXlbm().equals(map.get("xlBm").toString())
+										&& t1.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=l*100/100;
+									dh=Arith.add(dh, Arith.sub(nextJzyl,ylxs));
+									if(dh<0){
+										t.setHd(dh);
+										t.setCdl(dh);
+										nextJzyl=Arith.add(ylxs, dh);
+									}else{
+										t.setHd(dh);
+										t.setCdl(dh);
+										nextJzyl=ylxs;
+									}
+								}else{
+									t.setHd(0.0);
+									t.setCdl(0.0);
+								}
+							}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==listpbDc.size()-1){
+//										ylxs=czyl;
+									}else{
+										if(listpbDc.get(i+1).get("clZbh").toString().equals(map.get("clZbh").toString())){
+											l=Math.round(nextJzyl);
+											ylxs=l*100/100;
+										}
+										
+									}
+									dh=Arith.add(dh, Arith.sub(nextJzyl,ylxs));
+									if(dh<0){
+										t.setHd(dh);
+										t.setCdl(dh);
+										nextJzyl=Arith.add(ylxs, dh);
+									}else{
+										t.setHd(dh);
+										t.setCdl(dh);
+										nextJzyl=ylxs;
+									}
+								}else{
+									t.setHd(0.0);
+									t.setCdl(0.0);
+								}
+							}
+							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(date));
+							t.setLp(map.get("lpName").toString());
+							t.setCdl(Arith.add(t.getCdl(), t.getSh()));
+							if(!(t.getSsgsdm().equals("") || t.getFgsdm().equals(""))){
+								 if(type.equals("add")){
+									 t.setCreatetime(new Date());
+								 }else{
+									 t.setUpdatetime(new Date());
+								 }
+							 }
+							updateDlb.add(t);
+						}
+					}
+				}
+			}
+			mapList.put("updList", updateDlb);
+		}catch(Exception e){
+			logger.error("save erro.", e);
+		}
+		return mapList;
+	}
 }
@@ -33,14 +33,17 @@ import com.bsth.entity.Cars;
 import com.bsth.entity.Line;
 import com.bsth.entity.mcy_forms.Daily;
 import com.bsth.entity.oil.Cyl;
+import com.bsth.entity.oil.Dlb;
 import com.bsth.entity.oil.Ylb;
 import com.bsth.entity.oil.Ylxxb;
 import com.bsth.entity.search.CustomerSpecs;
 import com.bsth.repository.CarsRepository;
 import com.bsth.repository.oil.CylRepository;
+import com.bsth.repository.oil.DlbRepository;
 import com.bsth.repository.oil.YlbRepository;
 import com.bsth.repository.oil.YlxxbRepository;
 import com.bsth.service.impl.BaseServiceImpl;
+import com.bsth.service.oil.DlbService;
 import com.bsth.service.oil.YlbService;
 import com.bsth.service.realcontrol.ScheduleRealInfoService;
 import com.bsth.util.Arith;
@@ -48,6 +51,8 @@ import com.bsth.util.BatchSaveUtils;
 import com.bsth.util.ReportUtils;
 import com.github.abel533.echarts.code.Y;
+import javassist.bytecode.stackmap.BasicBlock.Catch;
+
 @Service
 public class YlbServiceImpl extends BaseServiceImpl<Ylb,Integer> implements YlbService{
 	@Autowired
@@ -55,6 +60,12 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 	@Autowired
 	YlxxbRepository ylxxbRepository;
+
+	@Autowired
+	DlbService dlbService;
+	
+	@Autowired
+	DlbRepository dlbRepository;
 	@Autowired
 	CylRepository cylRepository;
@@ -168,16 +179,6 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 								t.setCzyl(0.0);
 							}
 						}
-						
-						/*Double jzl=0.0;
-						//把当天的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+=ylxxb.getJzl();
-							}
-						}
-						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()));
@@ -212,7 +213,6 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 						logger.info("定时器:存在相同数据,数据已经过滤");
 					}
 				}
-//				new BatchSaveUtils<Ylb>().saveList(addList, Ylb.class); 
 			}
 			result = "success";
 		}catch (Exception e) {
@@ -670,15 +670,6 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 								}
 							}
 							repository.save(t);
-							/*for (int z = 0; z < cylList.size(); z++) {
-								Cyl cyl = cylList.get(z);
-								if (t.getNbbm().equals(cyl.getNbbm())) {
-									cyl.setCyl(t.getJzyl());
-									cyl.setUpdatetime(t.getRq());
-									break;
-								}
-								cylRepository.save(cyl);
-							}*/
 						}
 						map2.put("status", ResponseCode.SUCCESS);
 					}
@@ -770,63 +761,67 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 	                return s;  
 	            }  
 			});  
+			Map<String, Object> m=new HashMap<String,Object>();
 			for (int i = 0; i < ylxxbList.size(); i++) {
 				Boolean fage=false;
 				Ylxxb y1=ylxxbList.get(i);
-				Line line=BasicData.nbbm2LineMap.get(y1.getNbbm());
-				if(null !=line){
-					if(!xlbm.equals("")){
-						if(line.getLineCode().equals(xlbm)){
+				if(m.get(y1.getNbbm())!=null){
+					Line line=BasicData.nbbm2LineMap.get(y1.getNbbm());
+					if(null !=line){
+						if(!xlbm.equals("")){
+							if(line.getLineCode().equals(xlbm)){
+								fage=true;
+							}
+						}else{
 							fage=true;
 						}
-					}else{
-						fage=true;
-					}
-				}
-				
-				if(fage){
-					Ylb t=new Ylb();
-					t.setNbbm(y1.getNbbm());
-					t.setRq(y1.getYyrq());
-					t.setJsy(y1.getJsy());
-					t.setJzl(y1.getJzl());
-					t.setSsgsdm(y1.getGsdm());
-					String fgsdm="";
-					if(null !=carsMap.get(y1.getNbbm())){
-						fgsdm=carsMap.get(y1.getNbbm());
 					}
-					t.setFgsdm(fgsdm);
-					t.setJcsx(1);
-					if(null !=line){
-						t.setXlbm(line.getLineCode());
-					}else{
-						t.setXlbm("");
-					}
-					t.setJcsx(1);
-					boolean status=true;
-					for (int j = 0; j < ylListBe.size(); j++) {
-						Ylb b=ylListBe.get(j);
-						if(b.getNbbm().equals(y1.getNbbm())){
-							t.setCzyl(b.getJzyl());
-							status=false;
-							break;
+					
+					if(fage){
+						Ylb t=new Ylb();
+						t.setNbbm(y1.getNbbm());
+						t.setRq(y1.getYyrq());
+						t.setJsy(y1.getJsy());
+						t.setJzl(y1.getJzl());
+						t.setSsgsdm(y1.getGsdm());
+						String fgsdm="";
+						if(null !=carsMap.get(y1.getNbbm())){
+							fgsdm=carsMap.get(y1.getNbbm());
 						}
-					}
-					if(status){
-						t.setCzyl(0.0);
-					}
-//					double jzyl=Arith.add(t.getJzl(), t.getCzyl());
-					t.setJzyl(Arith.add(t.getJzl(), t.getCzyl()));
-					t.setYh(0.0);
-					 if(!(t.getSsgsdm().equals("") || t.getFgsdm().equals(""))){
-						 t.setCreatetime(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("核对有存油没里程：存在相同数据,数据已经过滤");
+						t.setFgsdm(fgsdm);
+						t.setJcsx(1);
+						if(null !=line){
+							t.setXlbm(line.getLineCode());
+						}else{
+							t.setXlbm("");
+						}
+						t.setJcsx(1);
+						boolean status=true;
+						for (int j = 0; j < ylListBe.size(); j++) {
+							Ylb b=ylListBe.get(j);
+							if(b.getNbbm().equals(y1.getNbbm())){
+								t.setCzyl(b.getJzyl());
+								status=false;
+								break;
+							}
+						}
+						if(status){
+							t.setCzyl(0.0);
+						}
+//						double jzyl=Arith.add(t.getJzl(), t.getCzyl());
+						t.setJzyl(Arith.add(t.getJzl(), t.getCzyl()));
+						t.setYh(0.0);
+						 if(!(t.getSsgsdm().equals("") || t.getFgsdm().equals(""))){
+							 t.setCreatetime(new Date());
+							 try {
+								 repository.save(t);
+								 m.put(t.getName(), t.getName());
+							} catch (Exception e) {
+								// TODO: handle exception
+								if(e.getMessage().indexOf("PK_YLB_UK")>0){
+									newMap.put("fage", "存在相同数据,数据已经过滤");
+									logger.info("核对有存油没里程：存在相同数据,数据已经过滤");
+								}
 							}
 						}
 					}
@@ -1439,4 +1434,228 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 		return lists;
 	}
+
+	@Override
+	public Map<String, Object> updateHistory(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, 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());
+		}
+		try{
+			String date = map.get("date").toString();
+			String line = map.get("line").toString();
+			String gsdm = map.get("gsdm").toString();
+			String fgsdm = map.get("fgsdm").toString();
+			
+			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(line, date,gsdm, fgsdm, "", "");
+			for (int i = 0; i < listpb.size(); i++) {
+				boolean sfdc=true;
+				Map<String, Object> m = listpb.get(i);
+				if (carsMap.get(m.get("clZbh").toString()) != null) {
+					sfdc = carsMap.get(m.get("clZbh").toString());
+				} else {
+					sfdc = true;
+				}
+				if(sfdc){
+					listpbDc.add(m);
+				}else{
+					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.listMaxRqJcsx(date, gsdm, fgsdm, line, "");
+			List<Ylb> ylbList=this.listOrderBy(date,gsdm,fgsdm,line,"","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;
+				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){
+					ylbList_del.add(t);
+				}
+				
+			}
+			
+			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 = listpb.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 (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()>0) {
+								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()>0) {
+									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.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")){
+							 t.setCreatetime(new Date());
+						 }else{
+							 t.setUpdatetime(new Date());
+						 }
+				    }
+				    repository.save(t);
+				    
+			    }
+			
+				for (int i = 0; i < ylbList_del.size(); i++) {
+					Ylb y=ylbList_del.get(i);
+					repository.delete(y.getId());
+				}
+				//重新统计油车数据结束
+
+				
+				
+				//重新获取电耗数据开始
+				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);
+					dlbRepository.save(d);
+				}
+				//重新获取电耗数据结束
+				newMap.put("status", ResponseCode.SUCCESS);
+			}catch(Exception e){
+				// TODO Auto-generated catch block
+				newMap.put("status", ResponseCode.ERROR);
+				throw e;
+			}
+		
+		
+		return newMap;
+	}
+
+	public List<Ylb> listByRqJcsx(String rq,String gsdm,String fgsdm,String xlbm,String nbbm,
+			String px) {
+		
+		return null;
+	}
 }
@@ -56,7 +56,7 @@ public class YlxxbServiceImpl extends BaseServiceImpl&lt;Ylxxb,Integer&gt; implements 
 		String fgsdm=map.get("fgsdm_like").toString();
 		String sql="	select * from ("
-				+ "select *,CONCAT(nbbm,jsy)  as nj "
+				+ "select *,CONCAT(nbbm,jsy)  as nj, CONCAT(nbbm,'_',jsy,'_',jzl) as njj "
 				+ " from bsth_c_ylxxb where yyrq='"+rq+"' "
 				+ " and gsdm ='"+gsdm+"' and jylx !='1') x where x.nj not in ("
 				+ " select CONCAT(nbbm,jsy)  from bsth_c_ylb "
@@ -65,35 +65,10 @@ public class YlxxbServiceImpl extends BaseServiceImpl&lt;Ylxxb,Integer&gt; implements 
 				+ " and x.nbbm in (select nbbm  from bsth_c_ylb "
 				+ " where rq='"+rq+"'"
 				+ " and ssgsdm='"+gsdm+"' and fgsdm ='"+fgsdm+"') "
-				+ " and x.nbbm not in (select nbbm from bsth_c_ylxxb"
-				+ " where yyrq='"+rq+"' and gsdm ='"+gsdm+"' AND jylx !='0')";
-
-
-		/*String sql= "select v.*,u.jsy as ldgh  from "
-				+ " ( select *  from   bsth_c_ylxxb x  where  "
-				+ " DATE_FORMAT(x.yyrq,'%Y-%m-%d')='"+rq+"'  and x.gsdm='"+gsdm+"'"
-				+ " and x.jsy not  in  ("
-				+ " select jsy  from bsth_c_ylb "
-				+ "  where DATE_FORMAT(rq,'%Y-%m-%d')='"+rq+"' "
-				+ " and ssgsdm='"+gsdm+"'  and fgsdm='"+fgsdm+"')"
-				+ " and x.nbbm  in (select nbbm  from bsth_c_ylb  "
-				+ " where DATE_FORMAT(rq,'%Y-%m-%d')='"+rq+"' "
-				+ " and ssgsdm='"+gsdm+"'  and fgsdm='"+fgsdm+"' )) v "
-				+ " left join (select * from  bsth_c_ylb "
-				+ " where DATE_FORMAT(rq,'%Y-%m-%d')='"+rq+"'"
-				+ " and ssgsdm='"+gsdm+"'  and fgsdm='"+fgsdm+"' )  u "
-				+ " on  v.nbbm=u.nbbm ";*/
-
-		//根具条件查询指定日期Ylxxb的数据
-//		List<Ylxxb> iterator=repository.checkYlxx(rq,gsdm);
-		/*if(map.get("gsdm_in")!=null){
-			map.put("ssgsdm_in", map.get("gsdm_in"));
-			map.remove("gsdm_in");
-
-		}else{
-			map.put("ssgsdm_like", map.get("gsdm_like"));
-			map.remove("gsdm_like");
-		}*/
+				+ " and x.nj not in (select CONCAT(nbbm,jsy) from bsth_c_ylxxb"
+				+ " where yyrq='"+rq+"' and gsdm ='"+gsdm+"' AND jylx in (1,3))"
+				+ " and x.njj not in (SELECT tj FROM bsth_c_ylxxb_update  "
+				+ " where yyrq='"+rq+"' and zt='3')";
 		//根具条件查询指定日期Ylb的数据
 //		List<Ylb> ylbIterator=ylbRepository.checkYl(rq,gsdm,fgsdm);
@@ -135,25 +110,6 @@ public class YlxxbServiceImpl extends BaseServiceImpl&lt;Ylxxb,Integer&gt; implements 
 			list.get(i).setLdgh(ldgh);
 		}
-		//正式使用用下面代码
-//		for (int i = 0; i < iterator.size(); i++) {
-//			Ylxxb y1=iterator.get(i);
-//			boolean fage=true;
-//			String ldgh="";
-//			for (int j = 0; j < ylbIterator.size(); j++) {
-//				Ylb	 y2 = ylbIterator.get(j);
-//				if(y1.getNbbm().equals(y2.getNbbm())){
-//					if(y1.getJsy().equals(y2.getJsy())){
-//						fage=false;
-//					}
-//					ldgh +=y2.getJsy()+"/";
-//				}
-//			}
-//			if(fage){
-//				y1.setLdgh(ldgh);
-//				list.add(y1);
-//			}
-//		}
@@ -186,6 +142,17 @@ public class YlxxbServiceImpl extends BaseServiceImpl&lt;Ylxxb,Integer&gt; implements 
 				if(!lsjsy.equals(jsy)){
 					if(ldgh.indexOf(jsy)>-1){
 						Ylxxb ylxxb=repository.findOne(id);
+						YlxxbUpdate ylxxbUpdate=new YlxxbUpdate();
+						ylxxbUpdate.setGsdm(ylxxb.getGsdm());
+						ylxxbUpdate.setJsy(ylxxb.getJsy());
+						ylxxbUpdate.setJzl(ylxxb.getJzl());
+						ylxxbUpdate.setJlrq(ylxxb.getJlrq());
+						ylxxbUpdate.setNbbm(ylxxb.getNbbm());
+						ylxxbUpdate.setYyrq(ylxxb.getYyrq());
+						ylxxbUpdate.setCreatetime(new Date());
+						ylxxbUpdate.setTj(ylxxb.getNbbm()+"_"+ylxxb.getJsy()+"_"+ylxxb.getJzl());
+						ylxxbUpdate.setZt(3);
+						updateRepository.save(ylxxbUpdate);
 						ylxxb.setJsy(jsy);
 						ylxxb.setJylx(3);
 						repository.save(ylxxb);
@@ -205,14 +172,26 @@ public class YlxxbServiceImpl extends BaseServiceImpl&lt;Ylxxb,Integer&gt; implements 
 		// TODO Auto-generated method stub
 		String rq=map.get("yyrq").toString();
 		String gsdm=map.get("gsdm_like").toString();
+		String fgsdm=map.get("fgsdm_like").toString();
+
 		String nbbm=map.get("nbbm").toString();
-	String sql="select * from (select *,CONCAT(t.nbbm,'_',t.jsy,'_',t.jzl) as tj "
-			+ " from bsth_c_ylxxb t where t.yyrq='"+rq+"' and t.gsdm='"+gsdm+"' and "
-			+ " t.nylx=0 and t.jylx=0 and t.nbbm like '%"+nbbm+"%') y "
-			+ " where y.nbbm not in (select c.inside_code from bsth_c_cars c "
-			+ " where c.business_code ='05' and c.sfdc=0) and y.tj not in ("
-			+ " select x.tj from bsth_c_ylxxb_update x)";
+	String sql="select * from ("
+			+ " select t.*,CONCAT(t.nbbm,'_',t.jsy,'_',t.jzl) as tj from bsth_c_ylxxb t  where "
+			+ " t.yyrq='"+rq+"' and t.gsdm='"+gsdm+"' and  t.nylx=0 and t.jylx in(0,2)  "
+			+ " and t.nbbm  in (select c.inside_code from bsth_c_cars c "
+			+ " where c.business_code ='"+gsdm+"' and c.sfdc=0 and c.branche_company_code ='"+fgsdm+"')"
+			+ " and t.nbbm not in (select nbbm from bsth_c_ylb y "
+			+ " where y.rq= '"+rq+"' and ssgsdm='"+gsdm+"' and fgsdm='"+fgsdm+"') "
+			+ " union "
+			+ " select t.*,CONCAT(t.nbbm,'_',t.jsy,'_',t.jzl) as tj from bsth_c_ylxxb t  where "
+			+ " t.yyrq ='"+rq+"' and t.gsdm='"+gsdm+"' and t.nylx=0 and t.jylx in(0,2) "
+			+ " and t.nbbm not in (	select c.inside_code from bsth_c_cars c  "
+			+ " where c.business_code ='"+gsdm+"' and c.sfdc=0 )"
+			+ " ) z"
+			+ " where z.tj not in ("
+			+ " SELECT x.tj FROM bsth_c_ylxxb_update x where x.yyrq='"+rq+"' and zt=2"
+			+ " ) and z.nbbm like '%"+nbbm+"%'";
 		//根具条件查询指定日期Ylb的数据
 //		List<Ylb> ylbIterator=ylbRepository.checkYl(rq,gsdm,fgsdm);
@@ -268,10 +247,11 @@ public class YlxxbServiceImpl extends BaseServiceImpl&lt;Ylxxb,Integer&gt; implements 
 					ylxxbUpdate.setJsy(ylxxb.getJsy());
 					ylxxbUpdate.setJzl(ylxxb.getJzl());
 					ylxxbUpdate.setJlrq(ylxxb.getJlrq());
-					ylxxbUpdate.setNbbm(ylxxb.getNbbm());
+					ylxxbUpdate.setNbbm(nbbm);
 					ylxxbUpdate.setYyrq(ylxxb.getYyrq());
 					ylxxbUpdate.setCreatetime(new Date());
 					ylxxbUpdate.setTj(nbbm+"_"+ylxxb.getJsy()+"_"+ylxxb.getJzl());
+					ylxxbUpdate.setZt(2);
 					updateRepository.save(ylxxbUpdate);
 				}
 			}
@@ -34,6 +34,7 @@
 								<th width="3%">#</th>
 								<th width="10%">日期</th>
 								<th width="10%">公司</th>
+								<th width="10%">分公司</th>
 								<th width="15%">车辆</th>
 								<th width="12%">驾驶员</th>
 								<th width="4%">加注量</th>
@@ -52,6 +53,9 @@
 									<select class="form-control" name="gsdm_like" id="jyryListGsdmId" ></select>
 								</td>
 								<td>
+									<select class="form-control" name="fgsdm_like" id="jyryListFgsdmId" ></select>
+								</td>
+								<td>
 									<input type="text" id="nbbm" class="form-control form-filter input-sm" name="nbbm">
 								</td>
 								<td>
@@ -92,6 +96,8 @@
 		{{obj.gsname}}
 	</td>
 	<td>
+	</td>
+	<td>
 		<input type="text" class="form-control in_carpark_nbbm"  name="nbbm" id="nbbm{{obj.id}}" data-id="{{obj.id}}" value="{{obj.nbbm}}"/>
 	</td>
 	<td>
@@ -173,16 +179,26 @@ $(function(){
 	$.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);
-// 			gsqx +=obj[i].companyCode+",";
 		}
 		$('#jyryListGsdmId').html(options);
-// 		updateCompany();
+		updateCompany();
 	});
-	
+	$("#jyryListGsdmId").on("change",updateCompany);
+	function updateCompany(){
+		var company = $('#jyryListGsdmId').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>';
+				}
+			}
+		}
+		$('#jyryListFgsdmId').html(options);
+	}
 	//提交
 	$('tr.filter .filter-submit').on('click', function(){
@@ -327,7 +327,6 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
                 layer.msg('请选择日期.');
             }
         })
-
         //进场等于出场
         $("#outAndIn").on('click', function () {
            // console.log("进场油量等于出场油量");