潘钊 / bsth_control · Commits

Commit 158e5f3c135ef790ddb68ea6f1a80ea882868f9c

Authored by 廖磊
1 parent fb922cb1

核对加注量

Inline Side-by-side
Showing 2 changed files with 22 additions and 10 deletions
src/main/java/com/bsth/service/oil/impl/YlbServiceImpl.java
  View file @158e5f3
... ... @@ -765,7 +765,7 @@ public class YlbServiceImpl extends BaseServiceImpl<Ylb,Integer> implements YlbS
765 765 for (int i = 0; i < ylxxbList.size(); i++) {
766 766 Boolean fage=false;
767 767 Ylxxb y1=ylxxbList.get(i);
768   - if(m.get(y1.getNbbm())!=null){
  768 + if(m.get(y1.getNbbm())==null){
769 769 Line line=BasicData.nbbm2LineMap.get(y1.getNbbm());
770 770 if(null !=line){
771 771 if(!xlbm.equals("")){
... ... @@ -808,7 +808,6 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
808 808 if(status){
809 809 t.setCzyl(0.0);
810 810 }
811   -// double jzyl=Arith.add(t.getJzl(), t.getCzyl());
812 811 t.setJzyl(Arith.add(t.getJzl(), t.getCzyl()));
813 812 t.setYh(0.0);
814 813 if(!(t.getSsgsdm().equals("") || t.getFgsdm().equals(""))){
... ...
src/main/resources/static/pages/oil/list_ph.html
  View file @158e5f3
... ... @@ -28,13 +28,13 @@
28 28 <div class="actions">
29 29 <a class="btn btn-circle blue" href="add.html" data-pjax><i
30 30 class="fa fa-plus"></i> 添加</a>
31   - <button type="button" class="btn btn-circle blue" id="removeButton">
  31 + <button type="button" class="btn btn-circle blue removeButton" id="removeButton">
32 32 <i class="fa fa-trash-o"></i> 删除
33 33 </button>
34   - <button type="button" class="btn btn-circle blue" id="sortButton">
  34 + <button type="button" class="btn btn-circle blue sortButton" id="sortButton">
35 35 <i class="fa fa-minus-square"></i> 拆分
36 36 </button>
37   - <button type="button" class="btn btn-circle blue" id="saveButton">
  37 + <button type="button" class="btn btn-circle blue saveButton" id="saveButton">
38 38 <i class="fa fa-check-circle"></i> 保存
39 39 </button>
40 40 <!-- <button type="button" class="btn btn-circle red" disabled="disabled" id="removeButton"><i class="fa fa-trash"></i> 删除用户</button> -->
... ... @@ -202,9 +202,22 @@
202 202 style="table-layout: fixed; overflow: auto; ">
203 203 <tbody></tbody>
204 204 </table>
  205 + <div style="text-align: right;margin-right: 50px">
  206 + <a class="btn btn-circle " href="add.html" data-pjax><i
  207 + class="fa fa-plus"></i> 添加</a>
  208 + <button type="button" class="btn btn-circle removeButton" >
  209 + <i class="fa fa-trash-o"></i> 删除
  210 + </button>
  211 + <button type="button" class="btn btn-circle sortButton">
  212 + <i class="fa fa-minus-square"></i> 拆分
  213 + </button>
  214 + <button type="button" class="btn btn-circle saveButton" >
  215 + <i class="fa fa-check-circle"></i> 保存
  216 + </button>
  217 + </div>
205 218 </div>
206 219  
207   -
  220 +
208 221 <div style="text-align: right;">
209 222 <ul id="pagination" class="pagination"></ul>
210 223 </div>
... ... @@ -314,7 +327,7 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
314 327 //var id = 15;
315 328 //$('.in_carpark_jzyl[data-id='+id+']', '#ll_oil_list')
316 329  
317   - $("#checkYl").on('click', function () {
  330 + $(".checkYl").on('click', function () {
318 331 //console.log("核对加注量");
319 332 if ($("#rq").val() != "") {
320 333 var params=getParamsList();
... ... @@ -329,7 +342,7 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
329 342 })
330 343  
331 344 //进场等于出场
332   - $("#outAndIn").on('click', function () {
  345 + $(".outAndIn").on('click', function () {
333 346 // console.log("进场油量等于出场油量");
334 347 if ($("#rq").val() != "") {
335 348 var params=getParamsList();
... ... @@ -344,7 +357,7 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
344 357 });
345 358  
346 359 //保存
347   - $("#saveButton").on('click',function(){
  360 + $(".saveButton").on('click',function(){
348 361 var ylArray = [];
349 362 $('input.icheck').each(function(){
350 363 var map = {};
... ... @@ -400,7 +413,7 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
400 413 });
401 414 })
402 415 //拆分
403   - $("#sortButton").on('click', function () {
  416 + $(".sortButton").on('click', function () {
404 417 if ($("#rq").val() != "") {
405 418 //拆分前先保存全部
406 419 var ylArray = [];
... ...