From e4bdab10c16898b55a64f6f262a013acd4fff813 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期三, 25 八月 2021 17:03:21 +0800
Subject: [PATCH] Merge branch 'xgmasrs' of https://gitee.com/luxiaotao1123/zy-asrs into xgmasrs
---
src/main/webapp/static/js/errorWrkMast/errorWrkMast.js | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
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: '澶囨敞'}
--
Gitblit v1.9.1