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/views/pda/stockOut.html |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/webapp/views/pda/stockOut.html b/src/main/webapp/views/pda/stockOut.html
index 1e1112f..9df140b 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: 'matNo', align: 'center', title: '缂栫爜', event: 'detail'},
-                {field: 'matName', align: 'center', title: '鍚嶇О', event: 'detail'},
+                {field: 'matnr', align: 'center', title: '缂栫爜', event: 'detail'},
+                {field: 'maktx', 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.matNo === locDetlData[i].matNo && data.locNo === locDetlData[i].locNo) {
+            if (data.matnr === locDetlData[i].matnr && 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].matNo === data.matNo) {
+            if (locDetlData[i].locNo === data.locNo && locDetlData[i].matnr === data.matnr) {
                 locDetlData.splice(i, 1);
             }
         }

--
Gitblit v1.9.1