From 446f0b9b81b0b54871a938d0366ffce14c844269 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 26 三月 2021 09:38:23 +0800
Subject: [PATCH] #
---
src/main/resources/mapper/PriorMapper.xml | 2 ++
src/main/webapp/views/safeSto/safeSto.html | 2 +-
src/main/java/zy/cloud/wms/manager/entity/SafeStoDo.java | 6 +++++-
src/main/webapp/static/js/safeSto/safeSto.js | 6 +++---
4 files changed, 11 insertions(+), 5 deletions(-)
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 9c1f828..3c03627 100644
--- a/src/main/java/zy/cloud/wms/manager/entity/SafeStoDo.java
+++ b/src/main/java/zy/cloud/wms/manager/entity/SafeStoDo.java
@@ -10,9 +10,13 @@
private Long nodeId;
+ private String node_name;
+
private String matnr;
- private Double safeQua;
+ private String maktx;
+
+ private Double safe_qua;
private Double amount;
diff --git a/src/main/resources/mapper/PriorMapper.xml b/src/main/resources/mapper/PriorMapper.xml
index 6a857bc..625d5e3 100644
--- a/src/main/resources/mapper/PriorMapper.xml
+++ b/src/main/resources/mapper/PriorMapper.xml
@@ -46,7 +46,9 @@
select
ROW_NUMBER() over (order by mp.create_time desc) as row,
mp.node_id,
+ mp.node_name,
mp.matnr,
+ mp.maktx,
mp.safe_qua,
ls.amount,
(cast(round((ls.amount/(mp.safe_qua*1.0))*100,2) as varchar)+'%') as progress
diff --git a/src/main/webapp/static/js/safeSto/safeSto.js b/src/main/webapp/static/js/safeSto/safeSto.js
index 8b53428..38994b5 100644
--- a/src/main/webapp/static/js/safeSto/safeSto.js
+++ b/src/main/webapp/static/js/safeSto/safeSto.js
@@ -19,12 +19,12 @@
toolbar: '#toolbar',
cellMinWidth: 50,
cols: [[
- {type: 'checkbox'}
+ {type: 'numbers', fixed: 'left'}
,{field: 'matnr', align: 'center',title: '鍟嗗搧缂栧彿'}
,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О'}
// ,{field: 'nodeId$', align: 'center',title: '鍏宠仈璐т綅'}
- ,{field: 'nodeId', align: 'center',title: '璐т綅鍚嶇О'}
- ,{field: 'safeQua', align: 'center',title: '瀹夊叏搴撳瓨'}
+ ,{field: 'node_name', align: 'center',title: '璐т綅'}
+ ,{field: 'safe_qua', align: 'center',title: '瀹夊叏搴撳瓨'}
,{field: 'amount', align: 'center',title: '瀹為檯搴撳瓨'}
,{field: 'progress', align: 'center',title: '杩涘害', templet: '#progressTpl'}
diff --git a/src/main/webapp/views/safeSto/safeSto.html b/src/main/webapp/views/safeSto/safeSto.html
index 360c746..4acfd8a 100644
--- a/src/main/webapp/views/safeSto/safeSto.html
+++ b/src/main/webapp/views/safeSto/safeSto.html
@@ -67,7 +67,7 @@
</script>
<script type="text/html" id="progressTpl">
<div class="layui-progress layuiadmin-order-progress" lay-filter="progress-"+ {{ d.orderid }} +"">
- <div class="layui-progress-bar layui-bg-blue" lay-percent= {{ d.progress }}></div>
+ <div class="layui-progress-bar layui-bg-blue" lay-percent= {{ d.progress }}></div>
</div>
</script>
--
Gitblit v1.9.1