油量页面输入自动计算，加油管理显示总油量，计划空驶修改

廖磊
1 parent 6d0f7a97
Showing 6 changed files with 107 additions and 13 deletions
src/main/java/com/bsth/entity/oil/Ylxxb.java
src/main/java/com/bsth/repository/oil/YlxxbRepository.java
src/main/java/com/bsth/service/oil/impl/CwjyServiceImpl.java
src/main/java/com/bsth/service/report/impl/CulateMileageServiceImpl.java
src/main/resources/static/pages/oil/jyglList.html
src/main/resources/static/pages/oil/list_ph.html
@@ -45,6 +45,9 @@ public class Ylxxb {
 	@Transient
 	private String fgsname;
+	@Transient
+	private Double zjzl;
+	
 	public Integer getId() {
 		return id;
@@ -184,5 +187,13 @@ public class Ylxxb {
 	public void setFgsname(String fgsname) {
 		this.fgsname = fgsname;
 	}
+	public Double getZjzl() {
+		return zjzl;
+	}
+	public void setZjzl(Double zjzl) {
+		this.zjzl = zjzl;
+	}
+	
+	
 }
@@ -20,7 +20,7 @@ public interface YlxxbRepository extends BaseRepository&lt;Ylxxb, Integer&gt;{
 	@Query(value="SELECT * FROM bsth_c_ylxxb  where to_days(?1)=to_days(yyrq) and nylx=?2 and gsdm like %?3%",nativeQuery=true)
 	List<Ylxxb> obtainYlxx(String rq,int nylx,String gsdm);
-	@Query(value="SELECT * FROM bsth_c_ylxxb  where to_days(?1)=to_days(yyrq) and ssgs=?2",nativeQuery=true)
+	@Query(value="SELECT * FROM bsth_c_ylxxb  where to_days(?1)=to_days(yyrq) and gsdm=?2",nativeQuery=true)
 	List<Ylxxb> checkYlxx(String rq,String gs);
 	@Query(value="SELECT * FROM bsth_c_ylxxb  where to_days(?1)=to_days(yyrq) and nbbm =?2 and jylx=1",nativeQuery=true)
@@ -31,6 +31,7 @@ import com.bsth.repository.oil.CwjyRepository;
 import com.bsth.repository.oil.YlxxbRepository;
 import com.bsth.service.impl.BaseServiceImpl;
 import com.bsth.service.oil.CwjyService;
+import com.bsth.util.Arith;
 import com.bsth.util.PageHelper;
 import com.bsth.util.PageObject;
@@ -314,7 +315,19 @@ public class CwjyServiceImpl extends BaseServiceImpl&lt;Cwjy,Integer&gt; implements Cw
 				 return t;
 			 }
 		});
-		
+		List<Ylxxb> list= ylxxbRepository.checkYlxx(rq, gsdm);
+		for (int i = 0; i < yList.size(); i++) {
+			Ylxxb t=yList.get(i);
+			Double zjzl=0.0;
+			for (int j = 0; j < list.size(); j++) {
+				Ylxxb y=list.get(j);
+				if(t.getNbbm().equals(y.getNbbm())){
+					zjzl=Arith.add(zjzl, y.getJzl());
+				}
+				
+			}
+			t.setZjzl(zjzl);
+		}
 		return yList;
 	}
@@ -529,11 +529,8 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
 			if(!scheduleRealInfo.isSflj()){
 				if (scheduleRealInfo.getBcType().equals("in") 
 						|| scheduleRealInfo.getBcType().equals("out")|| scheduleRealInfo.getBcType().equals("ldks")) {
-					double jhlcOrig=scheduleRealInfo.getJhlcOrig()==null?0:scheduleRealInfo.getJhlcOrig();
-					if(jhlcOrig-scheduleRealInfo.getJhlc()>0){
+					if(!scheduleRealInfo.isSflj()){
 						jcclc =Arith.add(jcclc, scheduleRealInfo.getJhlcOrig()==null?0:scheduleRealInfo.getJhlcOrig());
-					}else{
-						jcclc =Arith.add(jcclc, scheduleRealInfo.getJhlc()==null?0:scheduleRealInfo.getJhlc());
 					}
 				}
 			}
@@ -69,7 +69,7 @@
 								<th width="3%">油价</th>
 								<th width="4%">路单工号</th>
 								<th width="4%">备注</th>
-								<th width="10%">操作</th>
+								<th width="10%">总加注量</th>
 							</tr>
 							<tr role="row" class="filter">
 								<td></td>
@@ -160,7 +160,7 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
             type="text" value="{{obj.bz}}" style=" width:45px" />
 	</td>
 	<td>
-		<!--<a class="btn btn-sm blue btn-outline" onclick="editCyjy('{{obj.nbbm}}')" data-pjax><i class="fa fa-edit"></i> 编辑</a>-->
+		{{obj.zjzl}}
 	</td>
 </tr>
 {{/each}}
@@ -200,7 +200,6 @@ $(function(){
         	params['fgsbm']=$("#jyglListFgsdmId").val();
         	params['rq']=$("#rq").val();
         	 var i = layer.load(2);
-        	 console.log(params);
         	 $post('/cwjy/savejzl', params, function(){
         		 layer.close(i);
 		        		 var cells = $('tr.filter')[0].cells
@@ -316,7 +315,7 @@ $(function(){
 		params['page'] = page;
 		params['rq']=$("#rq").val();
-		var i = 2;
+		var i = layer.load(2);;
 		/* var jyglGsdm=$("#jyglListGsdmId").val();
 		var jyglFgsdm=$("#jyglListFgsdmId").val();
 		if(jyglGsdm=="" || jyglGsdm==null){
@@ -340,7 +339,6 @@ $(function(){
 			$.each(data, function(i, obj) {
                 obj.yyrq = $("#rq").val();
             });
-			console.log(data)
 			var bodyHtm = template('jygl_list_temp', {list: data});
 			$('#datatable_cwjy tbody').html(bodyHtm);
 			 iCheckChange();
@@ -229,7 +229,9 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
             onafterpaste="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')">
         </td>
         <td>
-			 {{obj.yh}}
+			 
+			<input data-id="{{obj.id}}" href="javascript:;" class="in_carpark_yh" 
+            type="text" value="{{obj.yh}}" style=" width:50px"  disabled="true"　readOnly="true"  />
         </td>
         <td>
 			<select data-id="{{obj.id}}" class="in_carpark_rylx" style=" width:80px" >
@@ -319,7 +321,6 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
             }
         });
-        
         //保存
         $("#saveButton").on('click',function(){
         	var ylArray = [];
@@ -627,9 +628,83 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
         		});
 //                 startOptJzylLink($('#ll_oil_list .in_carpark_jzyl'));
 //                 startOptShylLink($('#ll_oil_list .in_carpark_shyl'));
+            	 $('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=accAdd(jzyl,sh);
+            		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);
+            		
+                 });
             });
         }
+		
+		//页面计算防止精度丢失
+		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({