From b2fc5258724d5ab65ff7854df7e11261da039e0b Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@163.com> Date: 星期五, 26 三月 2021 11:03:10 +0800 Subject: [PATCH] # --- src/main/resources/mapper/PriorMapper.xml | 13 +++++++++---- src/main/webapp/views/safeSto/safeSto.html | 10 +++++++++- src/main/java/zy/cloud/wms/common/service/erp/ErpService.java | 3 +++ src/main/java/zy/cloud/wms/manager/entity/SafeStoDo.java | 2 ++ src/main/webapp/static/js/safeSto/safeSto.js | 2 +- 5 files changed, 24 insertions(+), 6 deletions(-) diff --git a/src/main/java/zy/cloud/wms/common/service/erp/ErpService.java b/src/main/java/zy/cloud/wms/common/service/erp/ErpService.java index aadd904..a701e59 100644 --- a/src/main/java/zy/cloud/wms/common/service/erp/ErpService.java +++ b/src/main/java/zy/cloud/wms/common/service/erp/ErpService.java @@ -30,6 +30,9 @@ * 鍗曟嵁涓婃姤 */ public Boolean uploadBill(List<BillDto> dtos, Integer docId, String docNumber){ + if (true) { + return true; + } try { if (Cools.isEmpty(dtos)) { return false; diff --git a/src/main/java/zy/cloud/wms/manager/entity/SafeStoDo.java b/src/main/java/zy/cloud/wms/manager/entity/SafeStoDo.java index 3c03627..8ef6f5d 100644 --- a/src/main/java/zy/cloud/wms/manager/entity/SafeStoDo.java +++ b/src/main/java/zy/cloud/wms/manager/entity/SafeStoDo.java @@ -22,4 +22,6 @@ private String progress; + private Integer status; + } diff --git a/src/main/resources/mapper/PriorMapper.xml b/src/main/resources/mapper/PriorMapper.xml index 625d5e3..fe74bea 100644 --- a/src/main/resources/mapper/PriorMapper.xml +++ b/src/main/resources/mapper/PriorMapper.xml @@ -50,10 +50,15 @@ mp.matnr, mp.maktx, mp.safe_qua, - ls.amount, - (cast(round((ls.amount/(mp.safe_qua*1.0))*100,2) as varchar)+'%') as progress + ISNULL(ls.amount, 0) as amount, + ISNULL((cast(round((ls.amount/(mp.safe_qua*1.0))*100,2) as varchar)+'%'), '0.00%') as progress, + case + when isnull(round((ls.amount/mp.safe_qua),2),0) > 1 then 1 + when isnull(round((ls.amount/mp.safe_qua),2),0) > 0.5 then 2 + else 3 + end as status from man_prior mp - inner join + left join ( select node_id, @@ -71,7 +76,7 @@ select count(1) as count from man_prior mp - inner join + left join ( select node_id, diff --git a/src/main/webapp/static/js/safeSto/safeSto.js b/src/main/webapp/static/js/safeSto/safeSto.js index d79a870..d9146a0 100644 --- a/src/main/webapp/static/js/safeSto/safeSto.js +++ b/src/main/webapp/static/js/safeSto/safeSto.js @@ -15,7 +15,6 @@ page: true, limit: 16, limits: [16, 30, 50, 100, 200, 500], - even: true, toolbar: '#toolbar', cellMinWidth: 50, cols: [[ @@ -24,6 +23,7 @@ ,{field: 'matnr', align: 'center',title: '鍟嗗搧缂栧彿'} ,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О'} ,{field: 'progress', align: 'center',title: '浣跨敤鎯呭喌', templet: '#progressTpl'} + ,{field: 'status', align: 'center',title: '璀︽姤', templet: '#statusTpl', width: 100} ,{field: 'safe_qua', align: 'center',title: '瀹夊叏搴撳瓨閲�', style: 'font-weight: bold'} ,{field: 'amount', align: 'center',title: '褰撳墠搴撳瓨閲�', style: 'font-weight: bold'} ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:150} diff --git a/src/main/webapp/views/safeSto/safeSto.html b/src/main/webapp/views/safeSto/safeSto.html index e3fb3c2..7009dc2 100644 --- a/src/main/webapp/views/safeSto/safeSto.html +++ b/src/main/webapp/views/safeSto/safeSto.html @@ -75,7 +75,15 @@ <div class="layui-progress-bar layui-bg-blue" lay-percent= {{ d.progress }}></div> </div> </script> - +<script type="text/html" id="statusTpl"> + {{# if(d.status == 1){ }} + <button class="layui-btn layui-btn-normal layui-btn-xs">婊′粨</button> + {{# } else if(d.status == 2){ }} + <button class="layui-btn layui-btn-primary layui-btn-xs">瀹夊叏</button> + {{# } else{ }} + <button class="layui-btn layui-btn-warm layui-btn-xs">鍗遍櫓</button> + {{# } }} +</script> <script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script> <script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script> -- Gitblit v1.9.1