From 240351d2a285eba42dfb3c3568eb4d339a05974b Mon Sep 17 00:00:00 2001
From: 18516761980 <4761516tqsxp>
Date: 星期三, 25 八月 2021 13:28:25 +0800
Subject: [PATCH] #
---
src/main/webapp/static/js/pakStore/locCheckOut.js | 18 +-
src/main/webapp/views/locDetl/locDetl.html | 2
src/main/webapp/static/js/pakStore/stockOut0.js | 20 +-
src/main/webapp/views/pakStore/locDetlQuery.html | 4
src/main/webapp/static/js/wrkMast/wrkMast.js | 18 +-
src/main/webapp/static/js/stoMan/stoQue.js | 16 +-
src/main/webapp/views/locDetl/locDetl_detail.html | 6
src/main/webapp/views/report/viewWorkOut.html | 2
src/main/webapp/views/wrkDetl/wrkDetl_detail.html | 8
src/main/webapp/views/pda/stockOut.html | 8
src/main/webapp/static/js/errorWrkMast/errorWrkMast.js | 18 +-
src/main/webapp/views/waitPakinLog/waitPakinLog_detail.html | 6
src/main/webapp/static/js/wrkDetl/wrkDetl.js | 20 +-
src/main/webapp/static/js/pakStore/stockAdjust.js | 28 ++--
src/main/webapp/views/wrkDetlLog/wrkDetlLog_detail.html | 6
src/main/webapp/views/report/viewWorkIn.html | 2
src/main/webapp/static/js/pakStore/stockOut.js | 20 +-
src/main/webapp/views/pda/locDetlIframe.html | 10
src/main/webapp/static/js/locDetl/locDetl.js | 18 +-
src/main/webapp/views/waitPakin/waitPakin_detail.html | 6
src/main/webapp/static/js/waitPakin/waitPakin.js | 6
src/main/webapp/views/pakStore/locDetlCheckQuery.html | 4
src/main/java/com/zy/ints/controller/WaitMatinController.java | 3
src/main/webapp/views/pakStore/locDetlQuery0.html | 4
src/main/webapp/static/js/handWrkMast/handWrkMast.js | 18 +-
src/main/webapp/views/waitPakin/waitPakin.html | 2
src/main/webapp/static/js/wrkDetlLog/wrkDetlLog.js | 21 +-
src/main/webapp/static/js/waitPakinLog/waitPakinLog.js | 6
src/main/webapp/views/pda/stockQuery.html | 8
29 files changed, 153 insertions(+), 155 deletions(-)
diff --git a/src/main/java/com/zy/ints/controller/WaitMatinController.java b/src/main/java/com/zy/ints/controller/WaitMatinController.java
index e91a819..a6520af 100644
--- a/src/main/java/com/zy/ints/controller/WaitMatinController.java
+++ b/src/main/java/com/zy/ints/controller/WaitMatinController.java
@@ -9,7 +9,6 @@
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
-import com.zy.asrs.entity.LocDetl;
import com.zy.asrs.entity.MatCode;
import com.zy.asrs.service.MatCodeService;
import com.zy.common.entity.KeyValueVo;
@@ -58,7 +57,7 @@
@ManagerAuth
public R getMatDataKV(@RequestParam(required = false) String condition) {
Wrapper<MatCode> wrapper = new EntityWrapper<MatCode>()
- .andNew().like("matnr", condition).or().like("maktx", condition)
+ .andNew().like("mat_no", condition).or().like("mat_name", condition)
.orderBy("create_time", false);
List<MatCode> mats = matCodeService.selectPage(new Page<>(1, 30), wrapper).getRecords();
List<KeyValueVo> valueVos = new ArrayList<>();
diff --git a/src/main/webapp/static/js/errorWrkMast/errorWrkMast.js b/src/main/webapp/static/js/errorWrkMast/errorWrkMast.js
index 7185f5a..12b3308 100644
--- a/src/main/webapp/static/js/errorWrkMast/errorWrkMast.js
+++ b/src/main/webapp/static/js/errorWrkMast/errorWrkMast.js
@@ -359,15 +359,15 @@
{type: 'checkbox'}
,{field: 'wrkNo', align: 'center',title: '宸ヤ綔鍙�'}
,{field: 'ioTime$', align: 'center',title: '宸ヤ綔鏃堕棿'}
- ,{field: 'matnr', align: 'center',title: '浜у搧'}
- ,{field: 'lgnum', align: 'center',title: '浠撳簱鍙�'}
- ,{field: 'tbnum', align: 'center',title: '杞偍璇锋眰缂栧彿'}
- ,{field: 'tbpos', align: 'center',title: '琛岄」鐩�'}
- ,{field: 'zmatid', align: 'center',title: '浜у搧鏍囩ID'}
- ,{field: 'maktx', align: 'center',title: '浜у搧鎻忚堪'}
- ,{field: 'werks', align: 'center',title: '宸ュ巶'}
- ,{field: 'anfme', align: 'center',title: '鏁伴噺'}
- ,{field: 'altme', align: 'center',title: '鍗曚綅'}
+ ,{field: 'matNo', align: 'center',title: '浜у搧缂栫爜'}
+ ,{field: 'matName', align: 'center',title: '浜у搧鍚嶇О'}
+ ,{field: 'specs', align: 'center',title: '瑙勬牸'}
+ ,{field: 'size', align: 'center',title: '灏哄'}
+ ,{field: 'color', align: 'center',title: '棰滆壊'}
+ // ,{field: 'zmatid', align: 'center',title: '浜у搧鏍囩ID'}
+ // ,{field: 'werks', align: 'center',title: '宸ュ巶'}
+ ,{field: 'qty', align: 'center',title: '鏁伴噺'}
+ ,{field: 'unit', align: 'center',title: '鍗曚綅'}
,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉＄爜'}
,{field: 'bname', align: 'center',title: '鐢ㄦ埛ID'}
,{field: 'memo', align: 'center',title: '澶囨敞'}
diff --git a/src/main/webapp/static/js/handWrkMast/handWrkMast.js b/src/main/webapp/static/js/handWrkMast/handWrkMast.js
index 686640d..30993af 100644
--- a/src/main/webapp/static/js/handWrkMast/handWrkMast.js
+++ b/src/main/webapp/static/js/handWrkMast/handWrkMast.js
@@ -355,15 +355,15 @@
{type: 'checkbox'}
,{field: 'wrkNo', align: 'center',title: '宸ヤ綔鍙�'}
,{field: 'ioTime$', align: 'center',title: '宸ヤ綔鏃堕棿'}
- ,{field: 'matnr', align: 'center',title: '鐗╂枡'}
- ,{field: 'lgnum', align: 'center',title: '浠撳簱鍙�'}
- ,{field: 'tbnum', align: 'center',title: '杞偍璇锋眰缂栧彿'}
- ,{field: 'tbpos', align: 'center',title: '琛岄」鐩�'}
- ,{field: 'zmatid', align: 'center',title: '鐗╂枡鏍囩ID'}
- ,{field: 'maktx', align: 'center',title: '鐗╂枡鎻忚堪'}
- ,{field: 'werks', align: 'center',title: '宸ュ巶'}
- ,{field: 'anfme', align: 'center',title: '鏁伴噺'}
- ,{field: 'altme', align: 'center',title: '鍗曚綅'}
+ ,{field: 'matNo', align: 'center',title: '浜у搧缂栫爜'}
+ ,{field: 'matName', align: 'center',title: '浜у搧鍚嶇О'}
+ ,{field: 'specs', align: 'center',title: '瑙勬牸'}
+ ,{field: 'size', align: 'center',title: '灏哄'}
+ ,{field: 'color', align: 'center',title: '棰滆壊'}
+ // ,{field: 'zmatid', align: 'center',title: '鐗╂枡鏍囩ID'}
+ // ,{field: 'werks', align: 'center',title: '宸ュ巶'}
+ ,{field: 'qty', align: 'center',title: '鏁伴噺'}
+ ,{field: 'unit', align: 'center',title: '鍗曚綅'}
,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉＄爜'}
,{field: 'bname', align: 'center',title: '鐢ㄦ埛ID'}
,{field: 'memo', align: 'center',title: '澶囨敞'}
diff --git a/src/main/webapp/static/js/locDetl/locDetl.js b/src/main/webapp/static/js/locDetl/locDetl.js
index eca2026..05959a4 100644
--- a/src/main/webapp/static/js/locDetl/locDetl.js
+++ b/src/main/webapp/static/js/locDetl/locDetl.js
@@ -212,7 +212,7 @@
layer.getChildFrame('#data-detail-submit-save', index).hide();
setFormVal(layer.getChildFrame('#detail', index), data, false);
top.convertDisabled(layer.getChildFrame('#data-detail :input', index), false);
- top.convertDisabled(layer.getChildFrame('#locNo,#matnr', index), true);
+ top.convertDisabled(layer.getChildFrame('#locNo,#matNo', index), true);
layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
layero.find('iframe')[0].contentWindow.layui.form.render('select');
layero.find('iframe')[0].contentWindow.layui.form.render('checkbox');
@@ -352,15 +352,15 @@
var data = {
// id: $('#id').val(),
locNo: $('#locNo').val(),
- matnr: $('#matnr').val(),
- lgnum: $('#lgnum').val(),
- tbnum: $('#tbnum').val(),
- tbpos: $('#tbpos').val(),
+ matNo: $('#matNo').val(),
+ matName: $('#matName').val(),
+ specs: $('#specs').val(),
+ size: $('#size').val(),
+ color: $('#color').val(),
zmatid: $('#zmatid').val(),
- maktx: $('#maktx').val(),
- werks: $('#werks').val(),
- anfme: $('#anfme').val(),
- altme: $('#altme').val(),
+ // werks: $('#werks').val(),
+ qty: $('#qty').val(),
+ unit: $('#unit').val(),
zpallet: $('#zpallet').val(),
bname: $('#bname').val(),
memo: $('#memo').val(),
diff --git a/src/main/webapp/static/js/pakStore/locCheckOut.js b/src/main/webapp/static/js/pakStore/locCheckOut.js
index f2840c3..da06c6e 100644
--- a/src/main/webapp/static/js/pakStore/locCheckOut.js
+++ b/src/main/webapp/static/js/pakStore/locCheckOut.js
@@ -31,7 +31,7 @@
// 椤甸潰淇敼
table.on('edit(chooseData)', function (obj) {
- updateLocDetlData(obj.data.locNo, obj.data.matnr, Number(obj.value));
+ updateLocDetlData(obj.data.locNo, obj.data.matNo, Number(obj.value));
});
// 鐩戝惉澶村伐鍏锋爮浜嬩欢
@@ -49,8 +49,8 @@
}
var locDetls = [];
data.forEach(function(elem) {
- // locDetls.push({locNo: elem.locNo, matnr: elem.matnr, count: elem.count}); // todo
- locDetls.push({locNo: elem.locNo, matnr: elem.matnr});
+ // locDetls.push({locNo: elem.locNo, matNo: elem.matNo, count: elem.count}); // todo
+ locDetls.push({locNo: elem.locNo, matNo: elem.matNo});
});
let param = {
outSite: staNo,
@@ -85,7 +85,7 @@
switch (obj.event) {
case 'remove':
for (var i = locDetlData.length - 1; i >= 0; i--) {
- if (locDetlData[i].locNo === data.locNo && locDetlData[i].matnr === data.matnr) {
+ if (locDetlData[i].locNo === data.locNo && locDetlData[i].matNo === data.matNo) {
locDetlData.splice(i, 1);
}
}
@@ -94,14 +94,14 @@
}
});
- function updateLocDetlData(locNo, matnr, count) {
+ function updateLocDetlData(locNo, matNo, count) {
if (isNaN(count)) {
layer.msg("璇疯緭鍏ユ暟瀛�");
} else {
if (count > 0) {
for (var i=0;i<locDetlData.length;i++){
- if (locDetlData[i]["locNo"] === locNo && locDetlData[i]["matnr"] === matnr){
- if (count > locDetlData[i]["anfme"]) {
+ if (locDetlData[i]["locNo"] === locNo && locDetlData[i]["matNo"] === matNo){
+ if (count > locDetlData[i]["qty"]) {
layer.msg("涓嶈兘瓒呰繃鍘熸暟閲�");
} else {
locDetlData[i]["count"] = count;
@@ -160,7 +160,7 @@
for (var i=0;i<data.length;i++){
let pass = false;
for (var j=0;j<locDetlData.length;j++){
- if (data[i].matnr === locDetlData[j].matnr && data[i].locNo$ === locDetlData[j].locNo$) {
+ if (data[i].matNo === locDetlData[j].matNo && data[i].locNo$ === locDetlData[j].locNo$) {
pass = true;
break;
}
@@ -168,7 +168,7 @@
if (pass) {
data.splice(i--, 1);
} else {
- data[i]["count"] = data[i]["anfme"];
+ data[i]["count"] = data[i]["qty"];
}
}
diff --git a/src/main/webapp/static/js/pakStore/stockAdjust.js b/src/main/webapp/static/js/pakStore/stockAdjust.js
index 8a429d3..970f9d8 100644
--- a/src/main/webapp/static/js/pakStore/stockAdjust.js
+++ b/src/main/webapp/static/js/pakStore/stockAdjust.js
@@ -5,9 +5,9 @@
function getCol() {
var cols = [
{fixed: 'left', field: 'count', title: '瀹為檯鏁伴噺', align: 'center', edit:'text', width: 120, style:'color: blue;font-weight: bold'}
- ,{field: 'anfme', align: 'center',title: '鏁伴噺'}
+ ,{field: 'qty', align: 'center',title: '鏁伴噺'}
];
- arrRemove(detlCols, "field", "anfme")
+ arrRemove(detlCols, "field", "qty")
cols.push.apply(cols, detlCols);
cols.push({fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:80})
return cols;
@@ -35,7 +35,7 @@
// 椤甸潰淇敼
table.on('edit(chooseData)', function (obj) {
- updateMatCodeData(obj.data.matnr, Number(obj.value));
+ updateMatCodeData(obj.data.matNo, Number(obj.value));
});
// 鐩戝惉澶村伐鍏锋爮浜嬩欢
@@ -94,7 +94,7 @@
switch (obj.event) {
case 'remove':
for (var i = matCodeData.length - 1; i >= 0; i--) {
- if (matCodeData[i].matnr === data.matnr) {
+ if (matCodeData[i].matNo === data.matNo) {
matCodeData.splice(i, 1);
}
}
@@ -124,7 +124,7 @@
matCodeData = [];
let data = res.data.records;
for (var i = 0; i<data.length; i++) {
- data[i]["count"] = data[i].anfme;
+ data[i]["count"] = data[i].qty;
data[i]["removeBtn"] = false;
matCodeData.push(data[i]);
}
@@ -174,13 +174,13 @@
}
}
- function updateMatCodeData(matnr, count) {
+ function updateMatCodeData(matNo, count) {
if (isNaN(count)) {
layer.msg("璇疯緭鍏ユ暟瀛�");
} else {
if (count >= 0) {
for (var i=0;i<matCodeData.length;i++){
- if (matCodeData[i]["matnr"] === matnr){
+ if (matCodeData[i]["matNo"] === matNo){
matCodeData[i]["count"] = count;
}
}
@@ -228,7 +228,7 @@
for (var i=0;i<data.length;i++){
let pass = false;
for (var j=0;j<matCodeData.length;j++){
- if (data[i].matNo === matCodeData[j].matnr) {
+ if (data[i].matNo === matCodeData[j].matNo) {
pass = true;
break;
}
@@ -238,12 +238,12 @@
count: initCountVal,
anfme: initAnfmeVal,
removeBtn: true,
- matnr: data[i].matNo,
- maktx: data[i].matName,
- lgnum: data[i].str2,
- color: data[i].str3,
- bname: data[i].str4,
- altme: data[i].str1,
+ matNo: data[i].matNo,
+ matName: data[i].matName,
+ specs: data[i].specs,
+ size: data[i].size,
+ unit: data[i].unit,
+ color: data[i].color,
})
}
}
diff --git a/src/main/webapp/static/js/pakStore/stockOut.js b/src/main/webapp/static/js/pakStore/stockOut.js
index 6c08a87..2cf0862 100644
--- a/src/main/webapp/static/js/pakStore/stockOut.js
+++ b/src/main/webapp/static/js/pakStore/stockOut.js
@@ -3,10 +3,10 @@
function getCol() {
var cols = [
// {field: 'count', align: 'center',title: '鍑哄簱鏁伴噺', edit:'text', width: 130, style:'color: blue;font-weight: bold'}
- {field: 'anfme', align: 'center',title: '鏁伴噺'}
+ {field: 'qty', align: 'center',title: '鏁伴噺'}
,{field: 'locNo$', align: 'center',title: '搴撲綅鍙�'}
];
- arrRemove(detlCols, 'field', 'anfme');
+ arrRemove(detlCols, 'field', 'qty');
cols.push.apply(cols, detlCols);
// cols.push({fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:80})
return cols;
@@ -34,7 +34,7 @@
// 椤甸潰淇敼
table.on('edit(chooseData)', function (obj) {
- updateLocDetlData(obj.data.locNo, obj.data.matnr, Number(obj.value));
+ updateLocDetlData(obj.data.locNo, obj.data.matNo, Number(obj.value));
});
// 鐩戝惉澶村伐鍏锋爮浜嬩欢
@@ -52,7 +52,7 @@
}
var locDetls = [];
data.forEach(function(elem) {
- locDetls.push({locNo: elem.locNo, matnr: elem.matnr, count: elem.count});
+ locDetls.push({locNo: elem.locNo, matNo: elem.matNo, count: elem.count});
});
let param = {
outSite: staNo,
@@ -87,7 +87,7 @@
switch (obj.event) {
case 'remove':
for (var i = locDetlData.length - 1; i >= 0; i--) {
- if (locDetlData[i].locNo === data.locNo && locDetlData[i].matnr === data.matnr) {
+ if (locDetlData[i].locNo === data.locNo && locDetlData[i].matNo === data.matNo) {
locDetlData.splice(i, 1);
}
}
@@ -96,14 +96,14 @@
}
});
- function updateLocDetlData(locNo, matnr, count) {
+ function updateLocDetlData(locNo, matNo, count) {
if (isNaN(count)) {
layer.msg("璇疯緭鍏ユ暟瀛�");
} else {
if (count > 0) {
for (var i=0;i<locDetlData.length;i++){
- if (locDetlData[i]["locNo"] === locNo && locDetlData[i]["matnr"] === matnr){
- if (count > locDetlData[i]["anfme"]) {
+ if (locDetlData[i]["locNo"] === locNo && locDetlData[i]["matNo"] === matNo){
+ if (count > locDetlData[i]["qty"]) {
layer.msg("涓嶈兘瓒呰繃鍘熸暟閲�");
} else {
locDetlData[i]["count"] = count;
@@ -162,7 +162,7 @@
for (var i=0;i<data.length;i++){
let pass = false;
for (var j=0;j<locDetlData.length;j++){
- if (data[i].matnr === locDetlData[j].matnr && data[i].locNo$ === locDetlData[j].locNo$) {
+ if (data[i].matNo === locDetlData[j].matNo && data[i].locNo$ === locDetlData[j].locNo$) {
pass = true;
break;
}
@@ -170,7 +170,7 @@
if (pass) {
data.splice(i--, 1);
} else {
- data[i]["count"] = data[i]["anfme"];
+ data[i]["count"] = data[i]["qty"];
}
}
diff --git a/src/main/webapp/static/js/pakStore/stockOut0.js b/src/main/webapp/static/js/pakStore/stockOut0.js
index 0d05eb9..5d79121 100644
--- a/src/main/webapp/static/js/pakStore/stockOut0.js
+++ b/src/main/webapp/static/js/pakStore/stockOut0.js
@@ -3,10 +3,10 @@
function getCol() {
var cols = [
{field: 'count', align: 'center',title: '鍑哄簱鏁伴噺', edit:'text', width: 130, style:'color: blue;font-weight: bold'}
- ,{field: 'anfme', align: 'center',title: '鍘熸暟閲�'}
+ ,{field: 'qty', align: 'center',title: '鍘熸暟閲�'}
,{field: 'locNo$', align: 'center',title: '搴撲綅鍙�'}
];
- arrRemove(detlCols, 'field', 'anfme');
+ arrRemove(detlCols, 'field', 'qty');
cols.push.apply(cols, detlCols);
cols.push({fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:80})
return cols;
@@ -34,7 +34,7 @@
// 椤甸潰淇敼
table.on('edit(chooseData)', function (obj) {
- updateLocDetlData(obj.data.locNo, obj.data.matnr, Number(obj.value));
+ updateLocDetlData(obj.data.locNo, obj.data.matNo, Number(obj.value));
});
// 鐩戝惉澶村伐鍏锋爮浜嬩欢
@@ -52,7 +52,7 @@
}
var locDetls = [];
data.forEach(function(elem) {
- locDetls.push({locNo: elem.locNo, matnr: elem.matnr, count: elem.count});
+ locDetls.push({locNo: elem.locNo, matNo: elem.matNo, count: elem.count});
});
let param = {
outSite: staNo,
@@ -87,7 +87,7 @@
switch (obj.event) {
case 'remove':
for (var i = locDetlData.length - 1; i >= 0; i--) {
- if (locDetlData[i].locNo === data.locNo && locDetlData[i].matnr === data.matnr) {
+ if (locDetlData[i].locNo === data.locNo && locDetlData[i].matNo === data.matNo) {
locDetlData.splice(i, 1);
}
}
@@ -96,14 +96,14 @@
}
});
- function updateLocDetlData(locNo, matnr, count) {
+ function updateLocDetlData(locNo, matNo, count) {
if (isNaN(count)) {
layer.msg("璇疯緭鍏ユ暟瀛�");
} else {
if (count > 0) {
for (var i=0;i<locDetlData.length;i++){
- if (locDetlData[i]["locNo"] === locNo && locDetlData[i]["matnr"] === matnr){
- if (count > locDetlData[i]["anfme"]) {
+ if (locDetlData[i]["locNo"] === locNo && locDetlData[i]["matNo"] === matNo){
+ if (count > locDetlData[i]["qty"]) {
layer.msg("涓嶈兘瓒呰繃鍘熸暟閲�");
} else {
locDetlData[i]["count"] = count;
@@ -162,7 +162,7 @@
for (var i=0;i<data.length;i++){
let pass = false;
for (var j=0;j<locDetlData.length;j++){
- if (data[i].matnr === locDetlData[j].matnr && data[i].locNo$ === locDetlData[j].locNo$) {
+ if (data[i].matNo === locDetlData[j].matNo && data[i].locNo$ === locDetlData[j].locNo$) {
pass = true;
break;
}
@@ -170,7 +170,7 @@
if (pass) {
data.splice(i--, 1);
} else {
- data[i]["count"] = data[i]["anfme"];
+ data[i]["count"] = data[i]["qty"];
}
}
diff --git a/src/main/webapp/static/js/stoMan/stoQue.js b/src/main/webapp/static/js/stoMan/stoQue.js
index 8c946b5..c8f0de3 100644
--- a/src/main/webapp/static/js/stoMan/stoQue.js
+++ b/src/main/webapp/static/js/stoMan/stoQue.js
@@ -201,15 +201,15 @@
cols: [[
// {type: 'checkbox'}
{field: 'locNo$', align: 'center',title: '搴撲綅鍙�'}
- ,{field: 'matnr', align: 'center',title: '浜у搧'}
- ,{field: 'lgnum', align: 'center',title: '浠撳簱鍙�'}
- ,{field: 'tbnum', align: 'center',title: '杞偍璇锋眰缂栧彿'}
+ ,{field: 'matNo', align: 'center',title: '浜у搧缂栫爜'}
+ ,{field: 'matName', align: 'center',title: '浜у搧鍚嶇О'}
+ ,{field: 'specs', align: 'center',title: '瑙勬牸'}
+ ,{field: 'size', align: 'center',title: '灏哄'}
// ,{field: 'tbpos', align: 'center',title: '琛岄」鐩�'}
- ,{field: 'zmatid', align: 'center',title: '浜у搧鏍囩ID'}
- ,{field: 'maktx', align: 'center',title: '浜у搧鎻忚堪'}
- ,{field: 'werks', align: 'center',title: '宸ュ巶'}
- ,{field: 'anfme', align: 'center',title: '鏁伴噺'}
- ,{field: 'altme', align: 'center',title: '鍗曚綅'}
+ // ,{field: 'zmatid', align: 'center',title: '浜у搧鏍囩ID'}
+ ,{field: 'color', align: 'center',title: '棰滆壊'}
+ ,{field: 'qty', align: 'center',title: '鏁伴噺'}
+ ,{field: 'unit', align: 'center',title: '鍗曚綅'}
,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉＄爜'}
,{field: 'bname', align: 'center',title: '鐢ㄦ埛ID'}
]],
diff --git a/src/main/webapp/static/js/waitPakin/waitPakin.js b/src/main/webapp/static/js/waitPakin/waitPakin.js
index ef7f164..0320130 100644
--- a/src/main/webapp/static/js/waitPakin/waitPakin.js
+++ b/src/main/webapp/static/js/waitPakin/waitPakin.js
@@ -319,9 +319,9 @@
// id: $('#id').val(),
id: $('#id').val(),
barcode: $('#barcode').val(),
- matnr: $('#matnr').val(),
- maktx: $('#maktx').val(),
- anfme: $('#anfme').val(),
+ matNo: $('#matNo').val(),
+ matName: $('#matName').val(),
+ qty: $('#qty').val(),
unit: $('#unit').val(),
status: $('#status').val(),
memo: $('#memo').val(),
diff --git a/src/main/webapp/static/js/waitPakinLog/waitPakinLog.js b/src/main/webapp/static/js/waitPakinLog/waitPakinLog.js
index 54fc129..69e2e52 100644
--- a/src/main/webapp/static/js/waitPakinLog/waitPakinLog.js
+++ b/src/main/webapp/static/js/waitPakinLog/waitPakinLog.js
@@ -319,9 +319,9 @@
id: $('#id').val(),
pakinId: $('#pakinId').val(),
barcode: $('#barcode').val(),
- matnr: $('#matnr').val(),
- maktx: $('#maktx').val(),
- anfme: $('#anfme').val(),
+ matNo: $('#matNo').val(),
+ matName: $('#matName').val(),
+ qty: $('#qty').val(),
unit: $('#unit').val(),
status: $('#status').val(),
memo: $('#memo').val(),
diff --git a/src/main/webapp/static/js/wrkDetl/wrkDetl.js b/src/main/webapp/static/js/wrkDetl/wrkDetl.js
index 9aad5bf..5309096 100644
--- a/src/main/webapp/static/js/wrkDetl/wrkDetl.js
+++ b/src/main/webapp/static/js/wrkDetl/wrkDetl.js
@@ -322,15 +322,15 @@
// id: $('#id').val(),
wrkNo: $('#wrkNo').val(),
ioTime: top.strToDate($('#ioTime\\$').val()),
- matnr: $('#matnr').val(),
- lgnum: $('#lgnum').val(),
- tbnum: $('#tbnum').val(),
- tbpos: $('#tbpos').val(),
- zmatid: $('#zmatid').val(),
- maktx: $('#maktx').val(),
- werks: $('#werks').val(),
- anfme: $('#anfme').val(),
- altme: $('#altme').val(),
+ matNo: $('#matNo').val(),
+ matName: $('#matName').val(),
+ specs: $('#specs').val(),
+ size: $('#size').val(),
+ color: $('#color').val(),
+ // zmatid: $('#zmatid').val(),
+ // werks: $('#werks').val(),
+ qty: $('#qty').val(),
+ unit: $('#unit').val(),
zpallet: $('#zpallet').val(),
bname: $('#bname').val(),
memo: $('#memo').val(),
@@ -338,7 +338,7 @@
modiTime: top.strToDate($('#modiTime\\$').val()),
appeUser: $('#appeUser').val(),
appeTime: top.strToDate($('#appeTime\\$').val()),
- nista: $('#nista').val(),
+ // nista: $('#nista').val(),
};
$.ajax({
diff --git a/src/main/webapp/static/js/wrkDetlLog/wrkDetlLog.js b/src/main/webapp/static/js/wrkDetlLog/wrkDetlLog.js
index c4a776a..bfc19c8 100644
--- a/src/main/webapp/static/js/wrkDetlLog/wrkDetlLog.js
+++ b/src/main/webapp/static/js/wrkDetlLog/wrkDetlLog.js
@@ -310,15 +310,15 @@
// id: $('#id').val(),
wrkNo: $('#wrkNo').val(),
ioTime: top.strToDate($('#ioTime\\$').val()),
- matnr: $('#matnr').val(),
- lgnum: $('#lgnum').val(),
- tbnum: $('#tbnum').val(),
- tbpos: $('#tbpos').val(),
- zmatid: $('#zmatid').val(),
- maktx: $('#maktx').val(),
- werks: $('#werks').val(),
- anfme: $('#anfme').val(),
- altme: $('#altme').val(),
+ matNo: $('#matNo').val(),
+ matName: $('#matName').val(),
+ specs: $('#specs').val(),
+ size: $('#size').val(),
+ color: $('#color').val(),
+ // zmatid: $('#zmatid').val(),
+ // werks: $('#werks').val(),
+ qty: $('#qty').val(),
+ unit: $('#unit').val(),
zpallet: $('#zpallet').val(),
bname: $('#bname').val(),
memo: $('#memo').val(),
@@ -326,8 +326,7 @@
modiTime: top.strToDate($('#modiTime\\$').val()),
appeUser: $('#appeUser').val(),
appeTime: top.strToDate($('#appeTime\\$').val()),
- nista: $('#nista').val(),
-
+ // nista: $('#nista').val(),
};
$.ajax({
url: baseUrl+"/wrkDetlLog/"+name+"/auth",
diff --git a/src/main/webapp/static/js/wrkMast/wrkMast.js b/src/main/webapp/static/js/wrkMast/wrkMast.js
index 28dfac5..deae1b9 100644
--- a/src/main/webapp/static/js/wrkMast/wrkMast.js
+++ b/src/main/webapp/static/js/wrkMast/wrkMast.js
@@ -563,15 +563,15 @@
{type: 'checkbox'}
,{field: 'wrkNo', align: 'center',title: '宸ヤ綔鍙�'}
,{field: 'ioTime$', align: 'center',title: '宸ヤ綔鏃堕棿'}
- ,{field: 'matnr', align: 'center',title: '浜у搧'}
- ,{field: 'lgnum', align: 'center',title: '浠撳簱鍙�'}
- ,{field: 'tbnum', align: 'center',title: '杞偍璇锋眰缂栧彿'}
- ,{field: 'tbpos', align: 'center',title: '琛岄」鐩�'}
- ,{field: 'zmatid', align: 'center',title: '浜у搧鏍囩ID'}
- ,{field: 'maktx', align: 'center',title: '浜у搧鎻忚堪'}
- ,{field: 'werks', align: 'center',title: '宸ュ巶'}
- ,{field: 'anfme', align: 'center',title: '鏁伴噺'}
- ,{field: 'altme', align: 'center',title: '鍗曚綅'}
+ ,{field: 'matNo', align: 'center',title: '浜у搧缂栫爜'}
+ ,{field: 'matName', align: 'center',title: '浜у搧鍚嶇О'}
+ ,{field: 'specs', align: 'center',title: '瑙勬牸'}
+ ,{field: 'size', align: 'center',title: '灏哄'}
+ ,{field: 'color', align: 'center',title: '棰滆壊'}
+ // ,{field: 'zmatid', align: 'center',title: '浜у搧鏍囩ID'}
+ // ,{field: 'werks', align: 'center',title: '宸ュ巶'}
+ ,{field: 'qty', align: 'center',title: '鏁伴噺'}
+ ,{field: 'unit', align: 'center',title: '鍗曚綅'}
,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉＄爜'}
,{field: 'bname', align: 'center',title: '鐢ㄦ埛ID'}
,{field: 'memo', align: 'center',title: '澶囨敞'}
diff --git a/src/main/webapp/views/locDetl/locDetl.html b/src/main/webapp/views/locDetl/locDetl.html
index f68af26..1e2bedf 100644
--- a/src/main/webapp/views/locDetl/locDetl.html
+++ b/src/main/webapp/views/locDetl/locDetl.html
@@ -21,7 +21,7 @@
</div>
<div class="layui-inline">
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="matnr" placeholder="浜у搧浠ｅ彿" autocomplete="off">
+ <input class="layui-input" type="text" name="mat_no" placeholder="浜у搧缂栫爜" autocomplete="off">
</div>
</div>
<div class="layui-inline">
diff --git a/src/main/webapp/views/locDetl/locDetl_detail.html b/src/main/webapp/views/locDetl/locDetl_detail.html
index e7b17ed..cd250d9 100644
--- a/src/main/webapp/views/locDetl/locDetl_detail.html
+++ b/src/main/webapp/views/locDetl/locDetl_detail.html
@@ -38,7 +38,7 @@
<div class="layui-inline" style="width:31%;">
<label class="layui-form-label"><span class="not-null">*</span>鐗┿��銆�鏂欙細</label>
<div class="layui-input-inline">
- <input id="matnr" class="layui-input" type="text" onkeyup="check(this.id, 'locDetl')" lay-verify="required" >
+ <input id="matNo" class="layui-input" type="text" onkeyup="check(this.id, 'locDetl')" lay-verify="required" >
</div>
</div>
<div class="layui-inline" style="width:31%;display: none">
@@ -68,7 +68,7 @@
<div class="layui-inline" style="width:31%;">
<label class="layui-form-label">浜у搧鎻忚堪锛�</label>
<div class="layui-input-inline">
- <input id="maktx" class="layui-input" type="text">
+ <input id="matName" class="layui-input" type="text">
</div>
</div>
<div class="layui-inline" style="width:31%;display: none">
@@ -80,7 +80,7 @@
<div class="layui-inline" style="width:31%;">
<label class="layui-form-label">鏁般��銆�閲忥細</label>
<div class="layui-input-inline">
- <input id="anfme" class="layui-input" type="text" lay-verify="number" >
+ <input id="qty" class="layui-input" type="text" lay-verify="number" >
</div>
</div>
<div class="layui-inline" style="width:31%;">
diff --git a/src/main/webapp/views/pakStore/locDetlCheckQuery.html b/src/main/webapp/views/pakStore/locDetlCheckQuery.html
index 7ba5f5f..e51cd64 100644
--- a/src/main/webapp/views/pakStore/locDetlCheckQuery.html
+++ b/src/main/webapp/views/pakStore/locDetlCheckQuery.html
@@ -52,12 +52,12 @@
</div>
<div class="layui-inline">
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="matnr" placeholder="浜у搧鍙�" autocomplete="off">
+ <input class="layui-input" type="text" name="mat_no" placeholder="浜у搧缂栫爜" autocomplete="off">
</div>
</div>
<div class="layui-inline">
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="maktx" placeholder="浜у搧鎻忚堪" autocomplete="off">
+ <input class="layui-input" type="text" name="mat_name" placeholder="浜у搧鍚嶇О" autocomplete="off">
</div>
</div>
<!-- 鏃ユ湡鑼冨洿 -->
diff --git a/src/main/webapp/views/pakStore/locDetlQuery.html b/src/main/webapp/views/pakStore/locDetlQuery.html
index fed937d..e604b4e 100644
--- a/src/main/webapp/views/pakStore/locDetlQuery.html
+++ b/src/main/webapp/views/pakStore/locDetlQuery.html
@@ -51,12 +51,12 @@
</div>
<div class="layui-inline">
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="matnr" placeholder="浜у搧鍙�" autocomplete="off">
+ <input class="layui-input" type="text" name="mat_no" placeholder="浜у搧缂栫爜" autocomplete="off">
</div>
</div>
<div class="layui-inline">
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="maktx" placeholder="浜у搧鎻忚堪" autocomplete="off">
+ <input class="layui-input" type="text" name="mat_name" placeholder="浜у搧鍚嶇О" autocomplete="off">
</div>
</div>
<!-- 鏃ユ湡鑼冨洿 -->
diff --git a/src/main/webapp/views/pakStore/locDetlQuery0.html b/src/main/webapp/views/pakStore/locDetlQuery0.html
index e18f204..781128a 100644
--- a/src/main/webapp/views/pakStore/locDetlQuery0.html
+++ b/src/main/webapp/views/pakStore/locDetlQuery0.html
@@ -51,12 +51,12 @@
</div>
<div class="layui-inline">
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="matnr" placeholder="鍟嗗搧缂栧彿" autocomplete="off">
+ <input class="layui-input" type="text" name="mat_no" placeholder="鍟嗗搧缂栧彿" autocomplete="off">
</div>
</div>
<div class="layui-inline">
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="maktx" placeholder="鐗╂枡鎻忚堪" autocomplete="off">
+ <input class="layui-input" type="text" name="mat_name" placeholder="鐗╂枡鎻忚堪" autocomplete="off">
</div>
</div>
<!-- 鏃ユ湡鑼冨洿 -->
diff --git a/src/main/webapp/views/pda/locDetlIframe.html b/src/main/webapp/views/pda/locDetlIframe.html
index 40aaa60..5a516da 100644
--- a/src/main/webapp/views/pda/locDetlIframe.html
+++ b/src/main/webapp/views/pda/locDetlIframe.html
@@ -85,11 +85,11 @@
</div>
<div class="form-item">
<span>浜у搧浠ｅ彿</span>
- <input id="matnr" type="text" disabled="disabled">
+ <input id="matNo" type="text" disabled="disabled">
</div>
<div class="form-item">
<span>浜у搧鍚嶇О</span>
- <input id="maktx" type="text" disabled="disabled">
+ <input id="matName" type="text" disabled="disabled">
</div>
<div class="form-item">
<span style="vertical-align: middle">鏁伴噺</span>
@@ -133,8 +133,8 @@
}
parent.updateTableData({
locNo: $('#locNo').val(),
- matnr: $('#matnr').val(),
- maktx: $('#maktx').val(),
+ matNo: $('#matNo').val(),
+ matName: $('#matName').val(),
count: countDom.val()
})
parent.layer.closeAll();
@@ -143,7 +143,7 @@
function remove() {
parent.removeTableData({
locNo: $('#locNo').val(),
- matnr: $('#matnr').val(),
+ matNo: $('#matNo').val(),
})
parent.layer.closeAll();
}
diff --git a/src/main/webapp/views/pda/stockOut.html b/src/main/webapp/views/pda/stockOut.html
index 9df140b..1e1112f 100644
--- a/src/main/webapp/views/pda/stockOut.html
+++ b/src/main/webapp/views/pda/stockOut.html
@@ -130,8 +130,8 @@
cols: [[
{type: 'checkbox', fixed: 'left', width:30},
{field: 'count', align: 'center', title: '鏁伴噺', event: 'detail', style:'color: blue', width:50},
- {field: 'matnr', align: 'center', title: '缂栫爜', event: 'detail'},
- {field: 'maktx', align: 'center', title: '鍚嶇О', event: 'detail'},
+ {field: 'matNo', align: 'center', title: '缂栫爜', event: 'detail'},
+ {field: 'matName', align: 'center', title: '鍚嶇О', event: 'detail'},
{field: 'locNo', align: 'center', title: '搴撲綅', event: 'detail'}
]],
done: function (res, curr, count) {
@@ -230,7 +230,7 @@
// 淇敼琛ㄦ牸鏁版嵁
function updateTableData(data) {
for (var i=0;i<locDetlData.length;i++) {
- if (data.matnr === locDetlData[i].matnr && data.locNo === locDetlData[i].locNo) {
+ if (data.matNo === locDetlData[i].matNo && data.locNo === locDetlData[i].locNo) {
locDetlData[i].count = data.count;
break
}
@@ -241,7 +241,7 @@
// 鍒犻櫎琛ㄦ牸琛�
function removeTableData(data) {
for (var i = locDetlData.length - 1; i >= 0; i--) {
- if (locDetlData[i].locNo === data.locNo && locDetlData[i].matnr === data.matnr) {
+ if (locDetlData[i].locNo === data.locNo && locDetlData[i].matNo === data.matNo) {
locDetlData.splice(i, 1);
}
}
diff --git a/src/main/webapp/views/pda/stockQuery.html b/src/main/webapp/views/pda/stockQuery.html
index e1dadb2..595f41c 100644
--- a/src/main/webapp/views/pda/stockQuery.html
+++ b/src/main/webapp/views/pda/stockQuery.html
@@ -108,8 +108,8 @@
limit: 500,
cellMinWidth: 50,
cols: [[
- {field: 'matnr', align: 'center', title: '缂栫爜', event: 'detail'},
- {field: 'maktx', align: 'center', title: '鍚嶇О', event: 'detail'},
+ {field: 'matNo', align: 'center', title: '缂栫爜', event: 'detail'},
+ {field: 'matName', align: 'center', title: '鍚嶇О', event: 'detail'},
{field: 'locNo', align: 'center', title: '搴撲綅', event: 'detail'},
{field: 'count', align: 'center', title: '鏁伴噺', event: 'detail', style:'color: blue', width:50},
{field: 'pickNum', align: 'center', title: '鎷ｆ枡', event: 'detail', width:50},
@@ -152,7 +152,7 @@
// 淇敼琛ㄦ牸鏁版嵁
function updateTableData(data) {
for (var i=0;i<locDetlData.length;i++) {
- if (data.matnr === locDetlData[i].matnr && data.locNo === locDetlData[i].locNo) {
+ if (data.matNo === locDetlData[i].matNo && data.locNo === locDetlData[i].locNo) {
locDetlData[i].count = data.count;
break
}
@@ -163,7 +163,7 @@
// 鍒犻櫎琛ㄦ牸琛�
function removeTableData(data) {
for (var i = locDetlData.length - 1; i >= 0; i--) {
- if (locDetlData[i].locNo === data.locNo && locDetlData[i].matnr === data.matnr) {
+ if (locDetlData[i].locNo === data.locNo && locDetlData[i].matNo === data.matNo) {
locDetlData.splice(i, 1);
}
}
diff --git a/src/main/webapp/views/report/viewWorkIn.html b/src/main/webapp/views/report/viewWorkIn.html
index 1a2d10c..ec37640 100644
--- a/src/main/webapp/views/report/viewWorkIn.html
+++ b/src/main/webapp/views/report/viewWorkIn.html
@@ -26,7 +26,7 @@
</div>
<div class="layui-inline">
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="matnr" placeholder="浜у搧浠ｅ彿" autocomplete="off">
+ <input class="layui-input" type="text" name="mat_no" placeholder="浜у搧浠ｅ彿" autocomplete="off">
</div>
</div>
<div class="layui-inline" style="width: 300px">
diff --git a/src/main/webapp/views/report/viewWorkOut.html b/src/main/webapp/views/report/viewWorkOut.html
index 6828e88..f94cf05 100644
--- a/src/main/webapp/views/report/viewWorkOut.html
+++ b/src/main/webapp/views/report/viewWorkOut.html
@@ -26,7 +26,7 @@
</div>
<div class="layui-inline">
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="matnr" placeholder="浜у搧浠ｅ彿" autocomplete="off">
+ <input class="layui-input" type="text" name="mat_no" placeholder="浜у搧缂栫爜" autocomplete="off">
</div>
</div>
<div class="layui-inline" style="width: 300px">
diff --git a/src/main/webapp/views/waitPakin/waitPakin.html b/src/main/webapp/views/waitPakin/waitPakin.html
index 0211803..a9d1b88 100644
--- a/src/main/webapp/views/waitPakin/waitPakin.html
+++ b/src/main/webapp/views/waitPakin/waitPakin.html
@@ -21,7 +21,7 @@
</div>
<div class="layui-inline">
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="matnr" placeholder="浜у搧浠ｅ彿" autocomplete="off">
+ <input class="layui-input" type="text" name="mat_no" placeholder="浜у搧浠ｅ彿" autocomplete="off">
</div>
</div>
<!-- 鏃ユ湡鑼冨洿 -->
diff --git a/src/main/webapp/views/waitPakin/waitPakin_detail.html b/src/main/webapp/views/waitPakin/waitPakin_detail.html
index 0086f2f..920d773 100644
--- a/src/main/webapp/views/waitPakin/waitPakin_detail.html
+++ b/src/main/webapp/views/waitPakin/waitPakin_detail.html
@@ -38,19 +38,19 @@
<div class="layui-inline" style="width:31%;">
<label class="layui-form-label">浜у搧浠ｅ彿锛�</label>
<div class="layui-input-inline">
- <input id="matnr" class="layui-input" type="text">
+ <input id="matNo" class="layui-input" type="text">
</div>
</div>
<div class="layui-inline" style="width:31%;">
<label class="layui-form-label">浜у搧鎻忚堪锛�</label>
<div class="layui-input-inline">
- <input id="maktx" class="layui-input" type="text">
+ <input id="matName" class="layui-input" type="text">
</div>
</div>
<div class="layui-inline" style="width:31%;">
<label class="layui-form-label">鏁般��銆�閲忥細</label>
<div class="layui-input-inline">
- <input id="anfme" class="layui-input" type="text" lay-verify="number" >
+ <input id="qty" class="layui-input" type="text" lay-verify="number" >
</div>
</div>
<div class="layui-inline" style="width:31%;">
diff --git a/src/main/webapp/views/waitPakinLog/waitPakinLog_detail.html b/src/main/webapp/views/waitPakinLog/waitPakinLog_detail.html
index 25b198c..35e33ff 100644
--- a/src/main/webapp/views/waitPakinLog/waitPakinLog_detail.html
+++ b/src/main/webapp/views/waitPakinLog/waitPakinLog_detail.html
@@ -44,19 +44,19 @@
<div class="layui-inline" style="width:31%;">
<label class="layui-form-label">浜у搧浠ｅ彿锛�</label>
<div class="layui-input-inline">
- <input id="matnr" class="layui-input" type="text">
+ <input id="matNo" class="layui-input" type="text">
</div>
</div>
<div class="layui-inline" style="width:31%;">
<label class="layui-form-label">浜у搧鎻忚堪锛�</label>
<div class="layui-input-inline">
- <input id="maktx" class="layui-input" type="text">
+ <input id="matName" class="layui-input" type="text">
</div>
</div>
<div class="layui-inline" style="width:31%;">
<label class="layui-form-label">鏁般��銆�閲忥細</label>
<div class="layui-input-inline">
- <input id="anfme" class="layui-input" type="text" lay-verify="number" >
+ <input id="qty" class="layui-input" type="text" lay-verify="number" >
</div>
</div>
<div class="layui-inline" style="width:31%;">
diff --git a/src/main/webapp/views/wrkDetl/wrkDetl_detail.html b/src/main/webapp/views/wrkDetl/wrkDetl_detail.html
index 8869010..ed73a09 100644
--- a/src/main/webapp/views/wrkDetl/wrkDetl_detail.html
+++ b/src/main/webapp/views/wrkDetl/wrkDetl_detail.html
@@ -30,7 +30,7 @@
<div class="layui-inline" style="width:31%;">
<label class="layui-form-label"><span class="not-null">*</span>鐗┿��銆�鏂欙細</label>
<div class="layui-input-inline">
- <input id="matnr" class="layui-input" type="text" lay-verify="required" >
+ <input id="matNo" class="layui-input" type="text" lay-verify="required" >
</div>
</div>
<div class="layui-inline" style="width:31%;">
@@ -60,7 +60,7 @@
<div class="layui-inline" style="width:31%;">
<label class="layui-form-label">浜у搧鎻忚堪锛�</label>
<div class="layui-input-inline">
- <input id="maktx" class="layui-input" type="text">
+ <input id="matName" class="layui-input" type="text">
</div>
</div>
<div class="layui-inline" style="width:31%;">
@@ -72,13 +72,13 @@
<div class="layui-inline" style="width:31%;">
<label class="layui-form-label">鏁般��銆�閲忥細</label>
<div class="layui-input-inline">
- <input id="anfme" class="layui-input" type="text" lay-verify="number" >
+ <input id="qty" class="layui-input" type="text" lay-verify="number" >
</div>
</div>
<div class="layui-inline" style="width:31%;">
<label class="layui-form-label">鍗曘��銆�浣嶏細</label>
<div class="layui-input-inline">
- <input id="altme" class="layui-input" type="text">
+ <input id="unit" class="layui-input" type="text">
</div>
</div>
<div class="layui-inline" style="width:31%;">
diff --git a/src/main/webapp/views/wrkDetlLog/wrkDetlLog_detail.html b/src/main/webapp/views/wrkDetlLog/wrkDetlLog_detail.html
index a614eec..6681140 100644
--- a/src/main/webapp/views/wrkDetlLog/wrkDetlLog_detail.html
+++ b/src/main/webapp/views/wrkDetlLog/wrkDetlLog_detail.html
@@ -38,7 +38,7 @@
<div class="layui-inline" style="width:31%;">
<label class="layui-form-label"><span class="not-null">*</span>浜у搧缂栧彿锛�</label>
<div class="layui-input-inline">
- <input id="matnr" class="layui-input" type="text" lay-verify="required" >
+ <input id="matNo" class="layui-input" type="text" lay-verify="required" >
</div>
</div>
<div class="layui-inline" style="width:31%;">
@@ -68,7 +68,7 @@
<div class="layui-inline" style="width:31%;">
<label class="layui-form-label">浜у搧鎻忚堪锛�</label>
<div class="layui-input-inline">
- <input id="maktx" class="layui-input" type="text">
+ <input id="matName" class="layui-input" type="text">
</div>
</div>
<div class="layui-inline" style="width:31%;">
@@ -80,7 +80,7 @@
<div class="layui-inline" style="width:31%;">
<label class="layui-form-label">鏁般��銆�閲忥細</label>
<div class="layui-input-inline">
- <input id="anfme" class="layui-input" type="text" lay-verify="number" >
+ <input id="qty" class="layui-input" type="text" lay-verify="number" >
</div>
</div>
<div class="layui-inline" style="width:31%;">
--
Gitblit v1.9.1