青浦250411工单：行车路单加实际损失公里等。

娄高锋
1 parent f819254f
Showing 5 changed files with 84 additions and 23 deletions
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/java/com/bsth/service/report/CulateMileageService.java
src/main/java/com/bsth/service/report/impl/CulateMileageServiceImpl.java
src/main/resources/static/pages/forms/mould/waybill_qingpu.xls
src/main/resources/static/pages/forms/statement/waybillQp.html
@@ -4491,12 +4491,13 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 //  		int cjbc = scheduleRealInfoRepository.findCjbc(jName, clZbh, lpName);
 //  		int ljbc = scheduleRealInfoRepository.findLjbc(jName, clZbh, lpName);
           int jhbc = 0, cjbc = 0, ljbc = 0, sjbc = 0;
-          double jhlc = 0, yygl = 0, ksgl = 0, tempJhlc = 0, jcclc = 0, ljjcclc = 0, jhjcclc = 0;
-          double addMileage = 0, remMileage = 0, addgl = 0, remgl = 0;
+          double jhlc = 0, yygl = 0, ksgl = 0, jcclc = 0, jhzks = 0, jhjcclc = 0;
+          double addMileage = 0, remMileage = 0, sjssgl = 0;
           Map<String, Object> map = new HashMap<String, Object>();
           jhlc = culateMieageService.culateJhgl(lists);
           jcclc = culateMieageService.culateJccgl(lists);
-          jhjcclc = culateMieageService.culateJhJccgl(lists);
+          jhzks = culateMieageService.culateJhJccgl(lists);
+          jhjcclc = culateMieageService.culateJhJccgl_real(lists);
           remMileage = culateMieageService.culateLbgl(lists);
           ksgl = culateMieageService.culateKsgl(lists_sj);
           yygl = culateMieageService.culateSjgl(lists_sj);
@@ -4505,14 +4506,17 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
           cjbc = culateMieageService.culateLbbc(lists);
           sjbc = culateMieageService.culateSjbc(lists_sj, "");
           ljbc = culateMieageService.culateLjbc(lists_sj, "");
+          sjssgl = Arith.sub(remMileage, addMileage);
           double zyygl = Arith.add(yygl, addMileage);
           double zksgl = Arith.add(ksgl, jcclc);
-          map.put("jhlc", Arith.add(jhlc, jhjcclc));
+          
+          map.put("jhlc", Arith.add(jhlc, jhzks));
           map.put("yygljh", jhlc);
           map.put("ssgl", remMileage);
           map.put("ksgl", ksgl);
           map.put("yyglsj", Arith.add(yygl, addMileage));
           map.put("jcclc", jcclc);
+          map.put("jhjcclc", jhjcclc);
           map.put("jhbc", jhbc);
           map.put("ljgl", addMileage);
           map.put("ssbc", cjbc);
@@ -4520,6 +4524,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
           map.put("sjbc", sjbc);
           map.put("zgl", Arith.add(zyygl, zksgl));
           map.put("ljbc", ljbc);
+          map.put("sjssgl", sjssgl); // 250423 实际损失公里：损失公里-加车公里，业主说是丢失公里和增加公里抵消掉，方便统计
           return map;
@@ -34,6 +34,8 @@ public interface CulateMileageService {
 	 double culateJccgl(List<ScheduleRealInfo> lists);
 	 double culateSjfyylc_spy(List<ScheduleRealInfo> lists);
 	 double culateJhJccgl(List<ScheduleRealInfo> lists);
+	 double culateJhKsgl_real(List<ScheduleRealInfo> lists);
+	 double culateJhJccgl_real(List<ScheduleRealInfo> lists);
 	 double culateCJLC(List<ScheduleRealInfo> lists,String item);
@@ -665,13 +665,31 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
 		return sjbc;
 	}
+	//空驶公里（空驶班次和子任务空驶，不含进出场班次）；culateKsgl + culateJccgl = 总空驶公里
 	@Override
 	public double culateKsgl(List<ScheduleRealInfo> lists) {
 		// TODO Auto-generated method stub
 		double ksgl =0;
 		for (int i = 0; i < lists.size(); i++) {
 			ScheduleRealInfo scheduleRealInfo=lists.get(i);
-			if (!isInOut(scheduleRealInfo)) {
+			if (scheduleRealInfo.getBcType().equals("ldks")) {
+				Set<ChildTaskPlan> childTaskPlans = scheduleRealInfo.getcTasks();
+				if(childTaskPlans.isEmpty()){
+					if(!scheduleRealInfo.isDestroy())
+						ksgl =Arith.add(ksgl, scheduleRealInfo.getJhlc()==null?0:scheduleRealInfo.getJhlc());
+				}else{
+					Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
+	                while (it.hasNext()) {
+	                    ChildTaskPlan childTaskPlan = it.next();
+	                    if(childTaskPlan.getMileageType().equals("empty") && childTaskPlan.getCcId()==null){
+	                    	 if (!childTaskPlan.isDestroy()) {
+	 	                    	Float jhgl=childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage();
+	 	                    	ksgl=Arith.add(ksgl,jhgl);
+	 	                    } 
+	                    }
+	                }
+				}
+			}else if (!isInOut(scheduleRealInfo)) {
 				Set<ChildTaskPlan> childTaskPlans = scheduleRealInfo.getcTasks();
 				if(!childTaskPlans.isEmpty()){
 					Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
@@ -690,6 +708,7 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
 		return ksgl;
 	}
+	//进出场公里（进出场班次，不含空驶班次和子任务空驶）；culateKsgl + culateJccgl = 总空驶公里
 	@Override
 	public double culateJccgl(List<ScheduleRealInfo> lists) {
 		// TODO Auto-generated method stub
@@ -697,7 +716,7 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
 		for (int i = 0; i < lists.size(); i++) {
 			ScheduleRealInfo scheduleRealInfo=lists.get(i);
 			if (scheduleRealInfo.getBcType().equals("in") 
-					|| scheduleRealInfo.getBcType().equals("out")||scheduleRealInfo.getBcType().equals("ldks")) {
+					|| scheduleRealInfo.getBcType().equals("out")) {
 				Set<ChildTaskPlan> childTaskPlans = scheduleRealInfo.getcTasks();
 				if(childTaskPlans.isEmpty()){
 					if(!scheduleRealInfo.isDestroy())
@@ -821,6 +840,7 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
 		return m;
 	}
+	//其实是计划总空驶公里（含计划进出场公里和计划空驶公里）; = culateJhKsgl_real + culateJhJccgl_real
 	@Override
 	public double culateJhJccgl(List<ScheduleRealInfo> lists) {
 		// TODO Auto-generated method stub
@@ -839,6 +859,40 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
 		return jcclc;
 	}
+	//仅计划进出场公里
+	@Override
+	public double culateJhKsgl_real(List<ScheduleRealInfo> lists) {
+		double jcclc = 0;
+		for (int i = 0; i < lists.size(); i++) {
+			ScheduleRealInfo scheduleRealInfo=lists.get(i);
+			if(!scheduleRealInfo.isSflj() && !scheduleRealInfo.isCcService()){
+				if (scheduleRealInfo.getBcType().equals("ldks")) {
+					if(!scheduleRealInfo.isSflj()){
+						jcclc =Arith.add(jcclc, scheduleRealInfo.getJhlcOrig()==null?0:scheduleRealInfo.getJhlcOrig());
+					}
+				}
+			}
+		}
+		return jcclc;
+	}
+	
+	//仅计划进出场公里
+	@Override
+	public double culateJhJccgl_real(List<ScheduleRealInfo> lists) {
+		double jcclc = 0;
+		for (int i = 0; i < lists.size(); i++) {
+			ScheduleRealInfo scheduleRealInfo=lists.get(i);
+			if(!scheduleRealInfo.isSflj() && !scheduleRealInfo.isCcService()){
+				if (scheduleRealInfo.getBcType().equals("in") || scheduleRealInfo.getBcType().equals("out")) {
+					if(!scheduleRealInfo.isSflj()){
+						jcclc =Arith.add(jcclc, scheduleRealInfo.getJhlcOrig()==null?0:scheduleRealInfo.getJhlcOrig());
+					}
+				}
+			}
+		}
+		return jcclc;
+	}
+	
 	public static boolean isInOut(ScheduleRealInfo s){
 		boolean fage=false;
 		if(s.getBcType().equals("in")){
@@ -375,40 +375,40 @@
 </script>
 <script type="text/html" id="ludan_3">
 	<tr>
-		<td colspan="2">计划公里</td>
+		<td colspan="2" title="计划营运公里+计划进出场公里（含计划空驶公里）">计划公里</td>
 		<td>{{map.jhlc}}</td>
-		<td colspan="2">营运公里(计划)</td>
+		<td colspan="2" title="计划营运公里">营运公里(计划)</td>
 		<td >{{map.yygljh}}</td>
-		<td >损失公里</td>
+		<td title="烂班公里">损失公里</td>
 		<td>{{map.ssgl}}</td>
-		<td colspan="3">空驶公里</td>
+		<td colspan="3" title="实际空驶公里，主要是子任务里的空驶公里">空驶公里</td>
 		<td colspan="1">{{map.ksgl}}</td>
-		<td colspan="3">营运公里(实际)</td>
+		<td colspan="3" title="实际营运公里+临加公里">营运公里(实际)</td>
 		<td colspan="2">{{map.yyglsj}}</td>
 	</tr>
 	<tr>
-		<td colspan="2">计划班次</td>
+		<td colspan="2" title="计划营运班次数">计划班次</td>
 		<td>{{map.jhbc}}</td>
-		<td colspan="2">进出场公里</td>
-		<td>{{map.jcclc}}</td>
-		<td >加车公里</td>
+		<td colspan="2" title="计划进出场公里（不含计划空驶公里）">进出场公里(计划)</td>
+		<td>{{map.jhjcclc}}</td>
+		<td title="临加公里">加车公里</td>
 		<td>{{map.ljgl}}</td>
-		<td colspan="3">损失班次</td>
+		<td colspan="3" title="烂班班次数">损失班次</td>
 		<td colspan="1">{{map.ssbc}}</td>
-		<td colspan="3"></td>
-		<td colspan="2"></td>
+		<td colspan="3" title="实际进出场公里（不含实际空驶公里）">进出场公里(实际)</td>
+		<td colspan="2">{{map.jcclc}}</td>
 	</tr>
 	<tr>
-		<td colspan="2">实际班次</td>
+		<td colspan="2" title="实际营运班次数（计划班次-损失班次+加车班次）">实际班次</td>
 		<td>{{map.sjbc}}</td>
-		<td colspan="2">总公里</td>
+		<td colspan="2" title="实际营运公里+临加公里+实际进出场公里（不含实际空驶公里）+实际空驶公里">总公里</td>
 		<td>{{map.zgl}}</td>
-		<td >加车班次</td>
+		<td title="临加班次数">加车班次</td>
 		<td>{{map.ljbc}}</td>
-		
-		<td colspan="4"></td>
+		<td colspan="3" title="损失公里-加车公里">实际损失公里</td>
+		<td colspan="1">{{map.sjssgl}}</td>
 		<td colspan="5"></td>
 	</tr>
 </script>