嘉定：油量平衡表，班次日报，行车路单中加入路牌加油里程

廖磊
1 parent 450f5ba9
Showing 14 changed files with 191 additions and 72 deletions
src/main/java/com/bsth/controller/jdtest/JdTestController.java
src/main/java/com/bsth/controller/oil/YlbController.java
src/main/java/com/bsth/entity/oil/Ylb.java
src/main/java/com/bsth/repository/oil/YlbRepository.java
src/main/java/com/bsth/service/impl/BusIntervalServiceImpl.java
src/main/java/com/bsth/service/jdtest/impl/JdtestServiceImpl.java
src/main/java/com/bsth/service/oil/impl/YlbServiceImpl.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/resources/static/pages/forms/mould/jd_daily.xls
src/main/resources/static/pages/forms/mould/list.xls
src/main/resources/static/pages/forms/mould/waybill_minhang.xls
src/main/resources/static/pages/forms/statement/jd_daily.html
src/main/resources/static/pages/forms/statement/waybill.html
src/main/resources/static/pages/oil/list_ph.html
@@ -40,7 +40,7 @@ public class JdTestController extends BaseController&lt;Ylb, Integer&gt;{
 		SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"),
 				sdfSimple = new SimpleDateFormat("yyyyMMdd");
 		Map<String, Object> dMap=new HashMap<>();
-		dMap.put("dGroup", "oilType");
+		dMap.put("dGroup_eq", "oilType");
 		Iterator<Dictionary> it= dictionaryService.list(dMap).iterator();
 		while (it.hasNext()) {
 			Dictionary d=it.next();
@@ -262,7 +262,7 @@ public class YlbController extends BaseController&lt;Ylb, Integer&gt;{
 		SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"),
 				sdfSimple = new SimpleDateFormat("yyyyMMdd");
 		Map<String, Object> dMap=new HashMap<>();
-		dMap.put("dGroup", "oilType");
+		dMap.put("dGroup_eq", "oilType");
 		Iterator<Dictionary> it= dictionaryService.list(dMap).iterator();
 		while (it.hasNext()) {
 			Dictionary d=it.next();
@@ -288,6 +288,8 @@ public class YlbController extends BaseController&lt;Ylb, Integer&gt;{
 			m.put("nbbm", y.getNbbm());
 			m.put("jsy", y.getJsy());
 			m.put("name", y.getName());
+			m.put("lp", y.getLp()==null?"":y.getLp());
+			m.put("jylc", y.getJylc_());
 			m.put("jzl", y.getJzl()<=0?"0":y.getJzl());
 			m.put("czlc", "0");
 			m.put("jzlc", "0");
@@ -12,6 +12,7 @@ import javax.persistence.Transient;
 import org.springframework.format.annotation.DateTimeFormat;
 import com.bsth.data.BasicData;
+import com.bsth.util.Arith;
 @Entity
 @Table(name = "bsth_c_ylb")
@@ -53,21 +54,25 @@ public class Ylb {
 	private Date edittime;
 	private Date updatetime;
 	private Date createtime;
+	private Double jylc;
+	
 	private int nylx;
 	//进场顺序（根据最先出场和最后进场来关联车辆的存油量）
 	private int jcsx;
 	private String lp;
+	
+	@Transient
+	private Double zlc_; //排班里程+路牌加油里程
+	@Transient
+	private Double jylc_;
 	@Transient
 	private String bglyh;
-	
 	@Transient
 	private String xlname;
-	
 	@Transient
 	private String gsname;
-	
 	@Transient
 	private String fgsname;
@@ -289,11 +294,12 @@ public class Ylb {
 	}
 	public String getBglyh() {
-		if(this.getZlc()==0){
+		 double zlcs=Arith.add(this.jylc==null?0.0:this.jylc, this.zlc);
+		if(zlcs<=0){
 			return "0";
 		}else{
 			DecimalFormat df = new DecimalFormat("0.00");
-			return df.format(this.getYh()/this.getZlc()*100);
+			return df.format(this.getYh()/zlcs*100);
 		}
 	}
@@ -358,6 +364,36 @@ public class Ylb {
 	public void setJname(String jname) {
 		this.jname = jname;
 	}
+
+	public Double getJylc() {
+//		if(jylc==null){
+//			jylc=0.0;
+//		}
+		return jylc;
+	}
+
+	public void setJylc(Double jylc) {
+		this.jylc = jylc;
+	}
+
+	public Double getZlc_() {
+		zlc_=Arith.add(this.jylc==null?0.0:this.jylc, this.zlc);
+		return zlc_;
+	}
+
+	public void setZlc_(Double zlc_) {
+		this.zlc_ = zlc_;
+	}
+
+	public Double getJylc_() {
+		jylc_=this.jylc==null?0.0:this.jylc;
+		return jylc_;
+	}
+
+	public void setJylc_(Double jylc_) {
+		this.jylc_ = jylc_;
+	}
+	
 }
@@ -25,6 +25,9 @@ public interface YlbRepository extends BaseRepository&lt;Ylb, Integer&gt;{
 			+ " xlbm like %?4% and nbbm like %?5% ",nativeQuery=true)
 	List<Ylb> obtainYlbefore(String rq,String gsbm,String fgsbm,String xlbm,String nbbm);
+	@Query(value="SELECT * FROM bsth_c_ylb where rq=?1 and  xlbm =?2 and jsy=?3 and nbbm=?4 and lp=?5 ",nativeQuery=true)
+	List<Ylb> selectYlbByLp(String rq,String xlbm,String jsy,String nbbm,String lp);
+
 	/**
 	 * 获取当天日期前的最大的日期中最大进出顺序的数据
@@ -186,9 +189,10 @@ public interface YlbRepository extends BaseRepository&lt;Ylb, Integer&gt;{
 				" shyy = ?6," +
 				" ns = ?7," +
 				" rylx = ?8," +
-				" yhlx = ?9"+
+				" yhlx = ?9,"+
+				" jylc =?10"+
 				" WHERE id = ?1", nativeQuery=true)
-	public void ylbUpdate(Integer id,double czyl,double jzyl,double yh, double sh,String shyy,double ns,String rylx,int yhlx);
+	public void ylbUpdate(Integer id,double czyl,double jzyl,double yh, double sh,String shyy,double ns,String rylx,int yhlx,double jylc);
 }
@@ -2558,7 +2558,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
     @Override
     public Map<String, Object> exportWaybillMore(Map<String, Object> map) {
     	Map<String, Object> dMap=new HashMap<>();
-		dMap.put("dGroup", "oilType");
+		dMap.put("dGroup_eq", "oilType");
 		Iterator<Dictionary> it= dictionaryService.list(dMap).iterator();
 		while (it.hasNext()) {
 			Dictionary d=it.next();
@@ -2589,6 +2589,8 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 //            file.mkdirs();	//创建
             Map<String, List<Ylb>> ylbMap = new HashMap<String, List<Ylb>>();
+            Map<String, Double> ylbMapJylc = new HashMap<String, Double>();
+
             Map<String, List<Dlb>> dlbMap = new HashMap<String, List<Dlb>>();
             Map<String, List<Cars>> carMap = new HashMap<String, List<Cars>>();
             List<ScheduleRealInfo> lists_line=scheduleRealInfoRepository.scheduleByDateAndLineTjrb(line, date);
@@ -2607,6 +2609,9 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 	        }
 	        for(Ylb ylb : queryYlbByRqXlbm){
+	        	//获取线路所以 加油里程
+	        	ylbMapJylc.put(ylb.getXlbm()+"-"+ylb.getJsy()+"-"+ylb.getNbbm()+"-"+(ylb.getLp()==null?"":ylb.getLp()), ylb.getJylc_());
+	        	
 	        	String key = ylb.getJsy() + ylb.getNbbm();
 	        	if(!ylbMap.containsKey(key))
 	        		ylbMap.put(key, new ArrayList<Ylb>());
@@ -2671,11 +2676,11 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 		        String nbbm = s.getClZbh();
 		        int type = 0;
-		        Double ccyl = 0.0;
-		        Double jcyl = 0.0;
-		        Double yh = 0.0;
-		        Double jzl = 0.0;
-		        Double zlc = 0.0;
+		        double ccyl = 0.0;
+		        double jcyl = 0.0;
+		        double yh = 0.0;
+		        double jzl = 0.0;
+		        double zlc = 0.0;
 		        String rylx="";
 //		        List<Ylb> listYlb = ylbRepository.queryListYlb(fcrq, s.getClZbh(), s.getjGh(),xlbm);
 //		        List<Dlb> listDlb = dlbRepository.queryListDlb(fcrq, s.getClZbh(), s.getjGh(),xlbm);
@@ -2737,6 +2742,8 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 						}
 					}
 				}
+				double jylc=ylbMapJylc.get(line+"-"+jGh+"-"+nbbm+"-"+lpName)==null?0.0:ylbMapJylc.get(line+"-"+jGh+"-"+nbbm+"-"+lpName);
+				Map.put("jylc", jylc);
 		        Map.put("rylx", "加注类别:"+rylx);
 		        Map.put("jzl", jzl);
 		        Map.put("yh", yh);
@@ -2813,7 +2820,8 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 		        Map.put("yygl", yygl);
 		        double ksgl=Arith.add(culateService.culateKsgl(scheduleRealInfos),culateService.culateJccgl(lists));
 		        Map.put("ksgl",ksgl);
-		        Map.put("realMileage", Arith.add(yygl ,ksgl));
+		        Map.put("realMileage", Arith.add(yygl ,ksgl)); //排班计算里程
+		        Map.put("realMileage2", Arith.add(jylc,Arith.add(yygl ,ksgl)));//排班计算里程+加油里程
 		        Map.put("jhbc", culateService.culateJhbc(scheduleRealInfos,""));
 		        Map.put("cjbc", culateService.culateLbbc(scheduleRealInfos));
 		        Map.put("ljbc", culateService.culateLjbc(lists, ""));
@@ -147,7 +147,7 @@ public class JdtestServiceImpl implements JdtestService {
 			}
 		});
 		Map<String, Object> dMap=new HashMap<>();
-		dMap.put("dGroup", "oilType");
+		dMap.put("dGroup_eq", "oilType");
 		Iterator<Dictionary> it= dictionaryService.list(dMap).iterator();
 		while (it.hasNext()) {
 			Dictionary d=it.next();
@@ -175,6 +175,7 @@ public class JdtestServiceImpl implements JdtestService {
 		}else{
 			lists=scheduleRealInfoRepository.scheduleByDateAndLineTjrb(xlbm, map.get("date").toString());
 		}
+		double jylc_z=0.0;
 		double jzyl_z=0.0;
 		double czyl_z=0.0;
 		double jzl_z=0.0;
@@ -187,6 +188,7 @@ public class JdtestServiceImpl implements JdtestService {
 		double zlc_z=0.0;
 		double zlc_z2=0.0;
+		double jylc_line=0.0;
 		double jzyl_line=0.0;
 		double czyl_line=0.0;
 		double jzl_line=0.0;
@@ -202,6 +204,7 @@ public class JdtestServiceImpl implements JdtestService {
 			sList =new ArrayList<ScheduleRealInfo>();
 			jList =new ArrayList<ScheduleRealInfo>();
 			Map<String, Object> m=list.get(i);
+			double jylc=0.0;
 			double jzyl=0.0;
 			double czyl=0.0;
 			double jzl=0.0;
@@ -213,6 +216,7 @@ public class JdtestServiceImpl implements JdtestService {
 				czyl=t.getCzyl();
 				jzl=t.getJzl();
 				yh=t.getYh();
+				jylc=t.getJylc_();
 				if(t.getRylx()!=null){
 					if(dMap.get(t.getRylx())==null){
 						rylx="";
@@ -221,6 +225,8 @@ public class JdtestServiceImpl implements JdtestService {
 					}
 				}
 			}
+			m.put("jylc",jylc);
+			jylc_z=Arith.add(jylc, jylc_z);
 			m.put("jzyl",jzyl);
 			jzyl_z=Arith.add(jzyl, jzyl_z);
 			m.put("czyl", czyl);
@@ -265,7 +271,7 @@ public class JdtestServiceImpl implements JdtestService {
 			double jccgl=culateMileageService.culateJccgl(sList);
 			double kszlc=Arith.add(ksgl, jccgl);
 			kszlc_z=Arith.add(kszlc, kszlc_z);
-			double zlc=Arith.add(sjzlc, kszlc);
+			double zlc=Arith.add(jylc, Arith.add(sjzlc, kszlc));
 			double zlc2=Math.round(Math.round(zlc));
 			zlc_z=Arith.add(zlc, zlc_z);
 			zlc_z2=Arith.add(zlc2,zlc_z2);
@@ -280,6 +286,7 @@ public class JdtestServiceImpl implements JdtestService {
 			//线路小计
 			if (i < list.size() - 1) {
 				 if ((list.get(i+1).get("xlBm").toString()).equals(list.get(i).get("xlBm").toString())) {
+					  jylc_line=Arith.add(jylc_line, jylc);
 					  jzyl_line=Arith.add(jzyl_line, jzyl);
 					  czyl_line=Arith.add(czyl_line, czyl);
 					  jzl_line=Arith.add(jzl_line, jzl);
@@ -292,6 +299,7 @@ public class JdtestServiceImpl implements JdtestService {
 					  zlc_line=Arith.add(zlc_line, zlc);
 					  zlc_line2=Arith.add(zlc_line2, zlc2);
 	             } else {
+					  jylc_line=Arith.add(jylc_line, jylc);
 	            	  jzyl_line=Arith.add(jzyl_line, jzyl);
 					  czyl_line=Arith.add(czyl_line, czyl);
 					  jzl_line=Arith.add(jzl_line, jzl);
@@ -315,6 +323,7 @@ public class JdtestServiceImpl implements JdtestService {
 					  mmm.put("sjbc", sjbc_line);
 					  mmm.put("sjzlc", sjzlc_line);
 					  mmm.put("kszlc",kszlc_line);
+					  mmm.put("jylc", jylc_line);
 					  mmm.put("zlc", zlc_line);
 					  mmm.put("zlc2", zlc_line2);
 					  mmm.put("jzyl",jzyl_line);
@@ -324,6 +333,7 @@ public class JdtestServiceImpl implements JdtestService {
 					  mmm.put("rylx", "");
 					  mmm.put("dh","");
 					  listAll.add(mmm);
+					  jylc_line=0.0;
 					  jzyl_line=0.0;
 					  czyl_line=0.0;
 					  jzl_line=0.0;
@@ -338,6 +348,7 @@ public class JdtestServiceImpl implements JdtestService {
 	             }
 			} else {
                 if ((list.get(i).get("xlBm").toString()).equals(list.get(i - 1).get("xlBm").toString())) {
+					  jylc_line=Arith.add(jylc_line, jylc);
 					  jzyl_line=Arith.add(jzyl_line, jzyl);
 					  czyl_line=Arith.add(czyl_line, czyl);
 					  jzl_line=Arith.add(jzl_line, jzl);
@@ -360,6 +371,7 @@ public class JdtestServiceImpl implements JdtestService {
 					  mmm.put("sjbc", sjbc_line);
 					  mmm.put("sjzlc", sjzlc_line);
 					  mmm.put("kszlc",kszlc_line);
+					  mmm.put("jylc", jylc_line);
 					  mmm.put("zlc", zlc_line);
 					  mmm.put("zlc2", zlc_line2);
 					  mmm.put("jzyl",jzyl_line);
@@ -382,6 +394,7 @@ public class JdtestServiceImpl implements JdtestService {
 					  mmm.put("sjbc", sjbc);
 					  mmm.put("sjzlc", sjzlc);
 					  mmm.put("kszlc",kszlc);
+					  mmm.put("jylc", jylc_line);
 					  mmm.put("zlc", zlc);
 					  mmm.put("zlc2", zlc2);
 					  mmm.put("jzyl",jzyl);
@@ -405,6 +418,7 @@ public class JdtestServiceImpl implements JdtestService {
 		mmp.put("sjbc", sjbc_z);
 		mmp.put("sjzlc", sjzlc_z);
 		mmp.put("kszlc",kszlc_z);
+		mmp.put("jylc", jylc_z);
 		mmp.put("zlc", zlc_z);
 		mmp.put("zlc2", zlc_z2);
 		mmp.put("jzyl",jzyl_z);
@@ -38,7 +38,9 @@ import com.bsth.entity.oil.Dlb;
 import com.bsth.entity.oil.Nylog;
 import com.bsth.entity.oil.Ylb;
 import com.bsth.entity.oil.Ylxxb;
+import com.bsth.entity.schedule.GuideboardInfo;
 import com.bsth.entity.search.CustomerSpecs;
+import com.bsth.entity.sys.Dictionary;
 import com.bsth.entity.sys.SysUser;
 import com.bsth.repository.CarsRepository;
 import com.bsth.repository.LineRepository;
@@ -47,6 +49,7 @@ import com.bsth.repository.oil.DlbRepository;
 import com.bsth.repository.oil.NylogRepository;
 import com.bsth.repository.oil.YlbRepository;
 import com.bsth.repository.oil.YlxxbRepository;
+import com.bsth.repository.schedule.GuideboardInfoRepository;
 import com.bsth.security.util.SecurityUtils;
 import com.bsth.service.impl.BaseServiceImpl;
 import com.bsth.service.oil.DlbService;
@@ -67,26 +70,20 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 	NylogRepository nylogRepository;
 	@Autowired
 	YlxxbRepository ylxxbRepository;
-
 	@Autowired
 	DlbService dlbService;
-	
 	@Autowired
 	DlbRepository dlbRepository;
-	
 	@Autowired
 	CylRepository cylRepository;
-	
 	@Autowired
 	CarsRepository carsRepository;
-	
-
 	@Autowired
 	LineRepository lineRepository;
-	
 	@Autowired
 	ScheduleRealInfoService scheduleRealInfoService;
-	
+	@Autowired
+	GuideboardInfoRepository guideboardInfoRepository;
 	@Autowired
 	JdbcTemplate jdbcTemplate;
@@ -103,6 +100,7 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 	public String obtainDsq() throws Exception{
 		String result = "failure";
 		try { 
+			
 			List<Ylb> addList = new ArrayList<Ylb>();
 			String type = "";
 			List<Cars> carsList=carsRepository.findCars();
@@ -134,7 +132,12 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 			List<Cyl> clyList=cylRepository.obtainCyl("","");
 			//从排班表中计算出行驶的总里程
 			List<Map<String,Object>> listpb=scheduleRealInfoService.yesterdayDataList("", rq, "", "", "", "");
-			
+			Iterator<GuideboardInfo> it=guideboardInfoRepository.findAll().iterator();
+			Map<String, Double> ginfoMap=new HashMap<>();
+			while (it.hasNext()) {
+				GuideboardInfo ginfo=it.next();
+				ginfoMap.put(ginfo.getXl().getLineCode()+"-"+ginfo.getLpName(), ginfo.getJygl()==null?0.0: ginfo.getJygl());
+			}
 			for(int x=0;x<listpb.size();x++){
 				boolean sfdc=true;
 				Map<String, Object> map=listpb.get(x);
@@ -207,6 +210,10 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 							if(type.equals("update")){
 								repository.save(t);
 							}else{
+								if(t.getJylc()==null){
+									t.setJylc(ginfoMap.get(t.getXlbm()+"-"+t.getLp()));
+								}
+								t.setJylc(0.0);
 								addList.add(t);
 							}
@@ -585,6 +592,12 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 	public Map<String, Object> obtain(Map<String, Object> map2) throws Exception{
 		Map<String, Object> newMap = new HashMap<String, Object>();
 		try {
+			Iterator<GuideboardInfo> it=guideboardInfoRepository.findAll().iterator();
+			Map<String, Double> ginfoMap=new HashMap<>();
+			while (it.hasNext()) {
+				GuideboardInfo ginfo=it.next();
+				ginfoMap.put(ginfo.getXl().getLineCode()+"-"+ginfo.getLpName(),  ginfo.getJygl());
+			}
 			Date date=new Date();
 			List<Cars> carsList = carsRepository.findCars();
 			Map<String, Boolean> carsMap = new HashMap<String, Boolean>();
@@ -842,8 +855,14 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 					 if(!(t.getSsgsdm().equals("") || t.getFgsdm().equals(""))){
 						 if(type.equals("add")){
 							 t.setCreatetime(date);
+							 if(t.getJylc()==null){
+								 t.setJylc(ginfoMap.get(t.getXlbm()+"-"+t.getLp()));
+							 }
 							 addList.add(t); 
 						 }else{
+							 if(t.getJylc()==null){
+								 t.setJylc(ginfoMap.get(t.getXlbm()+"-"+t.getLp()));
+							 }
 							 t.setUpdatetime(date);
 						     updateList.add(t); 
 						  }
@@ -1693,7 +1712,6 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 		JSONArray jsonArray=JSONArray.parseArray(json);
 		JSONObject jsonObject;
 		// 获取车辆存油信息
-		List<Cyl> cylList = cylRepository.obtainCyl("","");
 		for (int i = 0; i < jsonArray.size(); i++) {
 //			Ylb t=new Ylb();
 			jsonObject=jsonArray.getJSONObject(i);
@@ -1703,6 +1721,7 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 			double sh  =jsonObject.getDoubleValue("sh");
 			String shyy =jsonObject.getString("shyy");
 			double ns = jsonObject.getDoubleValue("ns");
+			double jylc=jsonObject.getDoubleValue("jylc");
 			String rylx =jsonObject.getString("rylx");
 			int yhlx =jsonObject.getIntValue("yhlx");
 			Integer id =jsonObject.getInteger("id");
@@ -1712,7 +1731,7 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 			if(yh<0){
 				yh=0.0;
 			}
-			repository.ylbUpdate(id, czyl, jzyl, yh, sh, shyy, ns, rylx,yhlx);
+			repository.ylbUpdate(id, czyl, jzyl, yh, sh, shyy, ns, rylx,yhlx,jylc);
 		}
 //		List<Map<String, Object>> list=(List<Map<String, Object>>) map.get("ylbList");
 		SysUser user = SecurityUtils.getCurrentUser();
@@ -990,12 +990,18 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                 }
             }
         }
+        List<Ylb> listYlb=ylbRepository.selectYlbByLp(date, line, jGh, clZbh, lpName);
+        Double jylc=0.0;
+        for (int i = 0; i < listYlb.size(); i++) {
+			Ylb y=listYlb.get(i);
+			jylc=y.getJylc_();
+		}
         DecimalFormat format = new DecimalFormat("0.00");
 //		int cjbc = scheduleRealInfoRepository.findCjbc(jName, clZbh, lpName);
 //		int ljbc = scheduleRealInfoRepository.findLjbc(jName, clZbh, lpName);
         //计算里程和班次数，并放入Map里
         Map<String, Object> map = this.MapById(scheduleRealInfos.get(0).getId());
-
+        map.put("jylc", jylc);
         map.put("jhlc", Arith.add(culateMieageService.culateJhgl(scheduleRealInfos), culateMieageService.culateJhJccgl(scheduleRealInfos)));
         map.put("remMileage", culateMieageService.culateLbgl(scheduleRealInfos));
         map.put("addMileage", culateMieageService.culateLjgl(lists));
@@ -1003,7 +1009,8 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         map.put("yygl", yygl);
         double ksgl = Arith.add(culateMieageService.culateKsgl(scheduleRealInfos), culateMieageService.culateJccgl(lists));
         map.put("ksgl", ksgl);
-        map.put("realMileage", Arith.add(yygl, ksgl));
+        map.put("realMileage", Arith.add(yygl, ksgl));//排班表计算里程
+        map.put("realMileage2", Arith.add(jylc, Arith.add(yygl, ksgl)));//排班表计算里程+加油里程
         map.put("jhbc", culateMieageService.culateJhbc(scheduleRealInfos, ""));
         map.put("cjbc", culateMieageService.culateLbbc(scheduleRealInfos));
         map.put("ljbc", culateMieageService.culateLjbc(lists, ""));
@@ -1950,6 +1957,13 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                 }
             }
         }
+        List<Ylb> listYlb=ylbRepository.selectYlbByLp(date, line, jGh, clZbh, lpName);
+        Double jylc=0.0;
+        for (int i = 0; i < listYlb.size(); i++) {
+			Ylb y=listYlb.get(i);
+			jylc=y.getJylc_();
+		}
+        map.put("jylc", jylc);
         map.put("jhbc", culateService.culateJhbc(list, ""));//计划班次
         map.put("jhlc", Arith.add(culateService.culateJhgl(list),
                 culateService.culateJhJccgl(list))); //计划总里程
@@ -1963,7 +1977,9 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         double jccgl = culateService.culateJccgl(lists);//空驶班次公里
         map.put("ksgl", ksgl);//空驶公里
         double sjgl = culateService.culateSjgl(lists);//实际营运公里
-        map.put("realMileage", Arith.add(Arith.add(ksgl, jccgl), Arith.add(sjgl, ljgl)));//总公里
+        double zlc=Arith.add(Arith.add(ksgl, jccgl), Arith.add(sjgl, ljgl));
+        map.put("realMileage",zlc );//排班总公里
+        map.put("realMileage2",Arith.add(zlc, jylc) );//排班总公里+加油里程
         map.put("zkslc", Arith.add(ksgl, jccgl));
         map.put("jcclc", jccgl);
         map.put("yygl", Arith.add(sjgl, ljgl)); //总营运公里
@@ -4576,7 +4592,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
     public Map<String, Object> MapById(Long id) {
         // TODO Auto-generated method stub
     	Map<String, Object> dMap=new HashMap<>();
-		dMap.put("dGroup", "oilType");
+		dMap.put("dGroup_eq", "oilType");
 		Iterator<Dictionary> it= dictionaryService.list(dMap).iterator();
 		while (it.hasNext()) {
 			Dictionary d=it.next();
@@ -4587,7 +4603,6 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         ScheduleRealInfo s = scheduleRealInfoRepository.scheduleById(id);
         String xlbm = s.getXlBm();
         String fcrq = s.getScheduleDateStr();
-
         int type = 2;
         Double ccyl = 0.0;
         Double jcyl = 0.0;
@@ -79,6 +79,7 @@
 								<td><label >实际班次</label></td>
 								<td><label >实际营运里程</label></td>
 								<td><label >空驶里程</label></td>
+								<td><label >加油里程</label></td>
 								<td><label >总里程</label></td>
 								<td><label >总里程(四舍五入)</label></td>
 								<td><label >出场存油</label></td>
@@ -258,6 +259,7 @@
 			<td>{{obj.sjbc}}</td>
 			<td>{{obj.sjzlc}}</td>
 			<td>{{obj.kszlc}}</td>
+			<td>{{obj.jylc}}</td>
 			<td>{{obj.zlc}}</td>
 			<td>{{obj.zlc2}}</td>
 			<td>{{obj.czyl}}</td>
@@ -526,7 +526,7 @@
 				{{obj.jhlc}}
 			{{/if}}
 			</td>
-			<td >
+			<td>
              	{{obj.remarks}}
 			</td>
 		</tr>
@@ -561,10 +561,10 @@
 	<tr>
 		<td colspan="2">空驶公里</td>
 		<td>{{zkslc}}</td>
+		<td colspan="2">加油里程</td>
+		<td>{{jylc}}</td>
 		<td colspan="2">总公里</td>
-		<td>{{realMileage}}</td>
-		<td colspan="2"></td>
-		<td></td>
+		<td>{{realMileage2}}</td>
 		<td colspan="3"></td>
 		<td colspan="2"></td>
 	</tr>
@@ -182,21 +182,23 @@
 							<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>
+						<td >公司</td>
+						<td >线路</td>
+						<td >路牌</td>
+						<td >自编号</td>
+						<td >驾驶员</td>
+						<td >加油量</td>
+						<td >出场存油</td>
+						<td >进场存油</td>
+						<td >油耗</td>
+						<td >燃油类型</td>
+						<td >尿素</td>
+						<td >耗损原因</td>
+						<td >耗损油量</td>
+						<td >加油里程</td>
+						<td >当日总里程</td>
+						<td >数据类型</td>
 						<td >百公里油耗</td>
 					</tr>
 				</thead>
@@ -236,13 +238,13 @@
             <input type="checkbox" name="id" class="group-checkable icheck" data-id="{{obj.id}}">
         </td>
 		<td width="40px">{{i+1}}</td>
-        <td  width="8%">
+        <td  >
             {{obj.rq}}
         </td>
-        <td width="5%">
+        <td >
             {{obj.fgsname}}
         </td>
-        <td  width="8%">
+        <td  >
 			{{if obj.linename=='' || obj.linename==null}}
 				{{obj.xlname}}
 			{{else}}
@@ -250,11 +252,14 @@
 			{{/if}}
         </td>
-        <td width="5%">
+		<td>
+			{{obj.lp}}
+		</td>
+        <td>
 			<lable data-id="{{obj.id}}" class="in_carpark_nbbm">{{obj.nbbm}}</lable>
         </td>
-        <td  width="7%">
+        <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>
@@ -267,28 +272,28 @@
 		{{/if}}
         </td>
-        <td width="4%">
+        <td>
 			<lable data-id="{{obj.id}}"  class="in_carpark_jzl"> {{obj.jzl}}</lable>
         </td>
-        <td width="5%">
+        <td >
 			<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%">
+        <td >
 			<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%">
+        <td>
 			<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%"> 
+        <td > 
 			<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> 
@@ -296,13 +301,13 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
 				<option value='3' {{if obj.rylx==3}}  selected = 'selected' {{/if}}>B5-负10号柴油</option> 
 			</select>
         </td>
-        <td width="4%">
+        <td >
 			<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%">
+        <td >
 			<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> 
@@ -315,22 +320,30 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
 				<option value='8' {{if obj.shyy==8}}  selected = 'selected' {{/if}}>车间(小修)</option> 
 			</select>
         </td>
-        <td width="5%">
+        <td>
 		<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>
+		<input data-id="{{obj.id}}" id="{{(i+1)}}_6" href="javascript:;" class="in_carpark_jylc yl_jylc"
+			value={{obj.jylc_}} 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 >
+            {{obj.zlc_}}
         </td>
-        <td width="5%">
+        <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>
@@ -394,11 +407,12 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
         //保存
         $(".saveButton").on('click',function(){
-        	
         	var params_=getParamsList();
+        	 var i = layer.load(2);
         	$get('/ylb/checkDate',params_,function(status){
         		if(status=='3'){
-           		 layer.msg('只能操作三天内数据.');
+           		 	layer.msg('只能操作三天内数据.');
+           			layer.close(i);
            		}else{
 		        	var ylArray = [];
 		        	$('input.icheck').each(function(){
@@ -429,6 +443,10 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
 		                	ns=0;
 		        		}
+		                var jylc=$('.in_carpark_jylc[data-id='+id+']', '#ll_oil_list').val();
+		                if(jylc==""||jylc==null){
+		                	jylc=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();
@@ -442,12 +460,13 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
 		                map['rylx']=rylx;
 		                map['yhlx']=yhlx;
 		                map['nbbm']=nbbm;
+		                map['jylc']=jylc;
 		                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();