From 37286cd9b177e9a1b8f28bfbc054c8cfedec6a5e Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期四, 26 八月 2021 08:50:57 +0800
Subject: [PATCH] Merge branch 'xgmasrs' of https://gitee.com/luxiaotao1123/zy-asrs into xgmasrs

---
 src/main/webapp/static/js/stoMan/stoQue.js |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/main/webapp/static/js/stoMan/stoQue.js b/src/main/webapp/static/js/stoMan/stoQue.js
index c8f0de3..8c946b5 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: 'matNo', align: 'center',title: '浜у搧缂栫爜'}
-                ,{field: 'matName', align: 'center',title: '浜у搧鍚嶇О'}
-                ,{field: 'specs', align: 'center',title: '瑙勬牸'}
-                ,{field: 'size', 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: 'color', align: 'center',title: '棰滆壊'}
-                ,{field: 'qty', align: 'center',title: '鏁伴噺'}
-                ,{field: 'unit', 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: 'zpallet', align: 'center',title: '鎵樼洏鏉$爜'}
                 ,{field: 'bname', align: 'center',title: '鐢ㄦ埛ID'}
             ]],

--
Gitblit v1.9.1