核对加注量

廖磊
1 parent fb922cb1
Showing 2 changed files with 22 additions and 10 deletions
src/main/java/com/bsth/service/oil/impl/YlbServiceImpl.java
src/main/resources/static/pages/oil/list_ph.html
@@ -765,7 +765,7 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 			for (int i = 0; i < ylxxbList.size(); i++) {
 				Boolean fage=false;
 				Ylxxb y1=ylxxbList.get(i);
-				if(m.get(y1.getNbbm())!=null){
+				if(m.get(y1.getNbbm())==null){
 					Line line=BasicData.nbbm2LineMap.get(y1.getNbbm());
 					if(null !=line){
 						if(!xlbm.equals("")){
@@ -808,7 +808,6 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 						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(""))){
@@ -28,13 +28,13 @@
 		<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" id="removeButton">
+			<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" id="sortButton">
+			<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" id="saveButton">
+			<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> -->
@@ -202,9 +202,22 @@
 			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>
@@ -314,7 +327,7 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
         //var id = 15;
         //$('.in_carpark_jzyl[data-id='+id+']', '#ll_oil_list')
-        $("#checkYl").on('click', function () {
+        $(".checkYl").on('click', function () {
             //console.log("核对加注量");
             if ($("#rq").val() != "") {
                 var params=getParamsList();
@@ -329,7 +342,7 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
         })
         //进场等于出场
-        $("#outAndIn").on('click', function () {
+        $(".outAndIn").on('click', function () {
            // console.log("进场油量等于出场油量");
             if ($("#rq").val() != "") {
                 var params=getParamsList();
@@ -344,7 +357,7 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
         });
         //保存
-        $("#saveButton").on('click',function(){
+        $(".saveButton").on('click',function(){
         	var ylArray = [];
         	$('input.icheck').each(function(){
         		var map = {};
@@ -400,7 +413,7 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
              });  
         })
         //拆分
-        $("#sortButton").on('click', function () {
+        $(".sortButton").on('click', function () {
             if ($("#rq").val() != "") {
             	//拆分前先保存全部  
             	var ylArray = [];