From 624ffcb4cfdc12d7b3b45d9641a50a14d2a9699f Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 30 六月 2020 10:00:23 +0800
Subject: [PATCH] #
---
src/main/webapp/static/css/pda.css | 1 +
src/main/webapp/views/pda/stockOut.html | 13 ++++++++-----
src/main/java/com/zy/common/model/MobileLocDetlVo.java | 20 ++++++++++----------
src/main/java/com/zy/asrs/controller/MobileController.java | 8 ++++----
4 files changed, 23 insertions(+), 19 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index b538a16..4f3b62b 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -65,8 +65,8 @@
locDetls.forEach(locDetl -> {
MobileLocDetlVo vo = new MobileLocDetlVo();
vo.setLocNo(locDetl.getLocNo());
- vo.setMatNo(locDetl.getMatnr());
- vo.setMatName(locDetl.getMaktx());
+ vo.setMatnr(locDetl.getMatnr());
+ vo.setMaktx(locDetl.getMaktx());
vo.setCount(locDetl.getAnfme());
res.add(vo);
});
@@ -79,8 +79,8 @@
locDetls.forEach(locDetl -> {
MobileLocDetlVo vo = new MobileLocDetlVo();
vo.setLocNo(locDetl.getLocNo());
- vo.setMatNo(locDetl.getMatnr());
- vo.setMatName(locDetl.getMaktx());
+ vo.setMatnr(locDetl.getMatnr());
+ vo.setMaktx(locDetl.getMaktx());
vo.setCount(locDetl.getAnfme());
res.add(vo);
});
diff --git a/src/main/java/com/zy/common/model/MobileLocDetlVo.java b/src/main/java/com/zy/common/model/MobileLocDetlVo.java
index 78a5701..5e8eed2 100644
--- a/src/main/java/com/zy/common/model/MobileLocDetlVo.java
+++ b/src/main/java/com/zy/common/model/MobileLocDetlVo.java
@@ -7,9 +7,9 @@
private String locNo;
- private String matNo;
+ private String matnr;
- private String matName;
+ private String maktx;
private Double count;
@@ -21,20 +21,20 @@
this.locNo = locNo;
}
- public String getMatNo() {
- return matNo;
+ public String getMatnr() {
+ return matnr;
}
- public void setMatNo(String matNo) {
- this.matNo = matNo;
+ public void setMatnr(String matnr) {
+ this.matnr = matnr;
}
- public String getMatName() {
- return matName;
+ public String getMaktx() {
+ return maktx;
}
- public void setMatName(String matName) {
- this.matName = matName;
+ public void setMaktx(String maktx) {
+ this.maktx = maktx;
}
public Double getCount() {
diff --git a/src/main/webapp/static/css/pda.css b/src/main/webapp/static/css/pda.css
index 4de3d51..8e5f71e 100644
--- a/src/main/webapp/static/css/pda.css
+++ b/src/main/webapp/static/css/pda.css
@@ -80,6 +80,7 @@
}
#tips {
display: inline-block;
+ width: 90px;
color: #666;
margin-left: 5px;
margin-bottom: 5px;
diff --git a/src/main/webapp/views/pda/stockOut.html b/src/main/webapp/views/pda/stockOut.html
index 4f4228d..06a5502 100644
--- a/src/main/webapp/views/pda/stockOut.html
+++ b/src/main/webapp/views/pda/stockOut.html
@@ -148,6 +148,7 @@
}
#tips {
display: inline-block;
+ width: 90px;
color: #666;
margin-left: 5px;
margin-bottom: 5px;
@@ -253,6 +254,7 @@
var form = layui.form;
tableIns = table.render({
+ id: 'tableIdx',
elem: '#dataByLoc',
data: [],
limit: 500,
@@ -260,8 +262,8 @@
cols: [[
{type: 'checkbox', fixed: 'left', width:30},
{field: 'count', align: 'center', title: '閲�', style:'color: blue', width:30},
- {field: 'matNo', align: 'center', title: '缂栫爜'},
- {field: 'matName', align: 'center', title: '鍚嶇О'},
+ {field: 'matnr', align: 'center', title: '缂栫爜'},
+ {field: 'maktx', align: 'center', title: '鍚嶇О'},
{field: 'locNo', align: 'center', title: '搴撲綅'}
]],
done: function (res, curr, count) {
@@ -293,8 +295,9 @@
// 鍑哄簱
function pakOut() {
- if (locDetlData.length === 0) {
- tips("鐗╂枡鏁版嵁涓虹┖", true);
+ var tableData = layui.table.checkStatus('tableIdx').data;
+ if (tableData.length === 0) {
+ tips("璇烽�夋嫨鐗╂枡", true);
document.getElementById("locNo").focus();
return;
}
@@ -308,7 +311,7 @@
headers: {'token': localStorage.getItem('token')},
data: JSON.stringify({
outSite: site,
- locDetls: locDetlData
+ locDetls: tableData
}),
contentType:'application/json;charset=UTF-8',
method: 'POST',
--
Gitblit v1.9.1