From 3f4dc532dcd3268ab90ca0f0ec10d5c70a529cdb Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期五, 31 十月 2025 15:08:29 +0800
Subject: [PATCH] #1
---
src/main/webapp/static/js/orderDetlPakout/orderDetl.js | 9 +-
src/main/webapp/static/js/pack/pack.js | 4
src/main/webapp/static/js/orderDetlPakin/orderDetl.js | 9 +-
src/main/webapp/views/pda/stockIn.html | 2
src/main/webapp/static/js/inventoryFlow/inventoryFlow.js | 6 +
src/main/webapp/static/js/saas/locDetl.js | 7 +
src/main/webapp/views/pda/comb.html | 2
src/main/webapp/static/js/wrkMast/wrkMast.js | 5
src/main/webapp/static/js/stoMan/stoQue.js | 2
src/main/webapp/static/js/orderDetl/orderDetl.js | 9 +-
src/main/webapp/static/js/locCheck/locCheck.js | 4
src/main/webapp/static/js/locDetlGroup/locDetlGroup.js | 6 +
src/main/webapp/static/js/matTurn/matTurn.js | 6 +
src/main/webapp/views/matTurn/turnOverQuery.html | 2
src/main/webapp/static/js/order/out.js | 13 +-
src/main/webapp/views/pda/stockOut.html | 2
src/main/webapp/static/js/adjDetl/adjDetl.js | 18 ++--
src/main/webapp/static/js/common.js | 4
src/main/webapp/static/js/errorWrkMast/errorWrkMast.js | 4
src/main/webapp/static/js/orderPakin/order.js | 18 ++-
src/main/webapp/static/js/report/workCountIn.js | 2
src/main/webapp/static/js/basAgvWrkDetl/basAgvWrkDetl.js | 8 +-
src/main/webapp/static/js/report/workCountOut.js | 2
src/main/webapp/static/js/saasLog/saasLog.js | 2
src/main/webapp/static/js/manLocDetl/manLocDetl.js | 6
src/main/webapp/static/js/orderPakin/out.js | 11 +-
src/main/webapp/static/js/locRule/locRule.js | 6 +
src/main/webapp/static/js/orderPakout/order.js | 18 ++-
src/main/webapp/static/js/orderPakout/out.js | 9 +-
src/main/webapp/views/pakStore/turnOverOwner.html | 2
src/main/webapp/static/js/handWrkMast/handWrkMast.js | 4
src/main/webapp/static/js/order/order.js | 10 +-
src/main/webapp/static/js/pakStore/turnOver.js | 5
src/main/webapp/static/js/basAgvLocDetl/basAgvLocDetl.js | 10 +-
34 files changed, 132 insertions(+), 95 deletions(-)
diff --git a/src/main/webapp/static/js/adjDetl/adjDetl.js b/src/main/webapp/static/js/adjDetl/adjDetl.js
index 1fe7723..6355fe2 100644
--- a/src/main/webapp/static/js/adjDetl/adjDetl.js
+++ b/src/main/webapp/static/js/adjDetl/adjDetl.js
@@ -21,19 +21,21 @@
// {type: 'checkbox'}
// ,{field: 'id', title: 'ID', sort: true,align: 'center', fixed: 'left', width: 80}
// {field: 'adjId', align: 'center',title: '搴忓彿'}
- {field: 'locNo', align: 'center',title: '搴撲綅鍙�'}
- ,{field: 'matnrOld', align: 'center',title: '鍘熷搧鍙�'}
- ,{field: 'matnr', align: 'center',title: '褰撳墠鍝佸彿'}
- ,{field: 'batch', align: 'center',title: '鎵瑰彿'}
+ {field: 'locNo', align: 'center',title: '搴撲綅鍙�',hide:false}
+ ,{field: 'matnrOld', align: 'center',title: '鍘熷搧鍙�',hide:false}
+ ,{field: 'matnr', align: 'center',title: 'sku',hide:false}
+ ,{field: 'supp', align: 'center',title: 'po',hide:false}
+ ,{field: 'sku', align: 'center',title: 'upc',hide:false}
+ ,{field: 'batch', align: 'center',title: '鎵瑰彿',hide:true}
// ,{field: 'oriCtns', align: 'center',title: '鍘熺鏁�'}
- ,{field: 'oriQty', align: 'center',title: '鍘熸暟閲�'}
+ ,{field: 'oriQty', align: 'center',title: '鍘熸暟閲�',hide:false}
// ,{field: 'oriWt', align: 'center',title: '鍘熼噸閲�'}
// ,{field: 'adjCtns', align: 'center',title: '鍙樻洿绠辨暟'}
- ,{field: 'adjQty', align: 'center',title: '鍙樻洿鏁伴噺'}
+ ,{field: 'adjQty', align: 'center',title: '鍙樻洿鏁伴噺',hide:false}
// ,{field: 'adjWt', align: 'center',title: '鍙樻洿閲嶉噺'}
,{field: 'memo', align: 'center',title: '澶囨敞',hide:true}
- ,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳'}
- ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿'}
+ ,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳',hide:true}
+ ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿',hide:true}
// ,{field: 'appeUser', align: 'center',title: '鍒涘缓鑰�'}
// ,{field: 'appeTime$', align: 'center',title: '娣诲姞鏃堕棿'}
diff --git a/src/main/webapp/static/js/basAgvLocDetl/basAgvLocDetl.js b/src/main/webapp/static/js/basAgvLocDetl/basAgvLocDetl.js
index ce7a93e..fba3177 100644
--- a/src/main/webapp/static/js/basAgvLocDetl/basAgvLocDetl.js
+++ b/src/main/webapp/static/js/basAgvLocDetl/basAgvLocDetl.js
@@ -25,9 +25,9 @@
,{field: 'locNo$', align: 'center',title: '搴撲綅鍙�'}
,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉＄爜'}
,{field: 'anfme', align: 'center',title: '鏁伴噺'}
- ,{field: 'matnr', align: 'center',title: '鐗╂枡'}
- ,{field: 'maktx', align: 'center',title: '鐗╂枡鎻忚堪'}
- ,{field: 'batch', align: 'center',title: '鎵瑰彿'}
+ ,{field: 'matnr', align: 'center',title: 'sku'}
+ ,{field: 'maktx', align: 'center',title: '鍚嶇О'}
+ ,{field: 'batch', align: 'center',title: '鎵瑰彿',hide:true}
,{field: 'orderNo', align: 'center',title: ''}
,{field: 'specs', align: 'center',title: '浠撳簱鍙�'}
,{field: 'model', align: 'center',title: '杞偍璇锋眰缂栧彿'}
@@ -35,7 +35,7 @@
,{field: 'brand', align: 'center',title: ''}
,{field: 'unit', align: 'center',title: ''}
,{field: 'price', align: 'center',title: ''}
- ,{field: 'sku', align: 'center',title: ''}
+ ,{field: 'sku', align: 'center',title: 'upc'}
,{field: 'units', align: 'center',title: ''}
,{field: 'barcode', align: 'center',title: ''}
,{field: 'origin', align: 'center',title: ''}
@@ -47,7 +47,7 @@
,{field: 'manLength', align: 'center',title: ''}
,{field: 'volume', align: 'center',title: ''}
,{field: 'threeCode', align: 'center',title: ''}
- ,{field: 'supp', align: 'center',title: ''}
+ ,{field: 'supp', align: 'center',title: 'po'}
,{field: 'suppCode', align: 'center',title: ''}
,{field: 'beBatch', align: 'center',title: ''}
,{field: 'deadTime', align: 'center',title: ''}
diff --git a/src/main/webapp/static/js/basAgvWrkDetl/basAgvWrkDetl.js b/src/main/webapp/static/js/basAgvWrkDetl/basAgvWrkDetl.js
index 892f0ed..11fd1fe 100644
--- a/src/main/webapp/static/js/basAgvWrkDetl/basAgvWrkDetl.js
+++ b/src/main/webapp/static/js/basAgvWrkDetl/basAgvWrkDetl.js
@@ -26,9 +26,9 @@
,{field: 'ioTime$', align: 'center',title: '宸ヤ綔鏃堕棿'}
,{field: 'anfme', align: 'center',title: '鏁伴噺'}
,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉＄爜'}
- ,{field: 'matnr', align: 'center',title: '鍟嗗搧缂栧彿'}
+ ,{field: 'matnr', align: 'center',title: 'sku'}
,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О'}
- ,{field: 'batch', align: 'center',title: '鎵瑰彿'}
+ ,{field: 'batch', align: 'center',title: '鎵瑰彿',hide:true}
,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿'}
,{field: 'specs', align: 'center',title: '瑙勬牸'}
,{field: 'model', align: 'center',title: '鍨嬪彿'}
@@ -36,7 +36,7 @@
,{field: 'brand', align: 'center',title: '鍝佺墝'}
,{field: 'unit', align: 'center',title: '鍗曚綅'}
,{field: 'price', align: 'center',title: '鍗曚环'}
- ,{field: 'sku', align: 'center',title: 'sku'}
+ ,{field: 'sku', align: 'center',title: 'upc'}
,{field: 'units', align: 'center',title: '鍗曚綅閲�'}
,{field: 'barcode', align: 'center',title: '鏉＄爜'}
,{field: 'origin', align: 'center',title: '浜у湴'}
@@ -48,7 +48,7 @@
,{field: 'manLength', align: 'center',title: '闀垮害'}
,{field: 'volume', align: 'center',title: '浣撶Н'}
,{field: 'threeCode', align: 'center',title: '涓夋柟缂栫爜'}
- ,{field: 'supp', align: 'center',title: '渚涘簲鍟�'}
+ ,{field: 'supp', align: 'center',title: 'po'}
,{field: 'suppCode', align: 'center',title: '渚涘簲鍟嗙紪鐮�'}
,{field: 'beBatch$', align: 'center',title: '鏄惁鎵规'}
,{field: 'deadTime', align: 'center',title: '淇濊川鏈�'}
diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js
index 41c3359..c26e962 100644
--- a/src/main/webapp/static/js/common.js
+++ b/src/main/webapp/static/js/common.js
@@ -185,7 +185,7 @@
// {field: 'id', align: 'center',title: 'ID'}
// ,{field: 'uuid', align: 'center',title: '缂栧彿'}
// ,{field: 'tagId$', align: 'center',title: '鎵�灞炲綊绫�'}
- ,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О', width: 200}
+ ,{field: 'maktx', align: 'center',title: '鍚嶇О', width: 200}
// ,{field: 'name', align: 'center',title: '鍒悕'}
,{field: 'specs', align: 'center',title: '瑙勬牸', hide: true}
,{field: 'model', align: 'center',title: '浠ｇ爜', hide: true}
@@ -225,7 +225,7 @@
{field: 'matnr', align: 'center',title: 'SKU', sort:true}
,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О', sort:true}
,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', hide: false}
- ,{field: 'batch', align: 'center',title: '璐у搧鐗瑰緛', sort:true}
+ ,{field: 'batch', align: 'center',title: '璐у搧鐗瑰緛', sort:true,hide:true}
,{field: 'anfme', align: 'center',title: '鏁伴噺', hide: false}
,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉＄爜', hide: false}
diff --git a/src/main/webapp/static/js/errorWrkMast/errorWrkMast.js b/src/main/webapp/static/js/errorWrkMast/errorWrkMast.js
index bff82e3..b73b554 100644
--- a/src/main/webapp/static/js/errorWrkMast/errorWrkMast.js
+++ b/src/main/webapp/static/js/errorWrkMast/errorWrkMast.js
@@ -359,7 +359,9 @@
{type: 'checkbox'}
,{field: 'wrkNo', align: 'center',title: '宸ヤ綔鍙�'}
,{field: 'ioTime$', align: 'center',title: '宸ヤ綔鏃堕棿'}
- ,{field: 'matnr', align: 'center',title: '鐗╂枡'}
+ ,{field: 'matnr', align: 'center',title: 'sku'}
+ ,{field: 'supp', align: 'center',title: 'po'}
+ ,{field: 'sku', align: 'center',title: 'upc'}
,{field: 'lgnum', align: 'center',title: '浠撳簱鍙�'}
,{field: 'tbnum', align: 'center',title: '杞偍璇锋眰缂栧彿'}
,{field: 'tbpos', 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..7748e29 100644
--- a/src/main/webapp/static/js/handWrkMast/handWrkMast.js
+++ b/src/main/webapp/static/js/handWrkMast/handWrkMast.js
@@ -355,7 +355,9 @@
{type: 'checkbox'}
,{field: 'wrkNo', align: 'center',title: '宸ヤ綔鍙�'}
,{field: 'ioTime$', align: 'center',title: '宸ヤ綔鏃堕棿'}
- ,{field: 'matnr', align: 'center',title: '鐗╂枡'}
+ ,{field: 'matnr', align: 'center',title: 'sku'}
+ ,{field: 'supp', align: 'center',title: 'po'}
+ ,{field: 'sku', align: 'center',title: 'upc'}
,{field: 'lgnum', align: 'center',title: '浠撳簱鍙�'}
,{field: 'tbnum', align: 'center',title: '杞偍璇锋眰缂栧彿'}
,{field: 'tbpos', align: 'center',title: '琛岄」鐩�'}
diff --git a/src/main/webapp/static/js/inventoryFlow/inventoryFlow.js b/src/main/webapp/static/js/inventoryFlow/inventoryFlow.js
index d14a330..ffa47dd 100644
--- a/src/main/webapp/static/js/inventoryFlow/inventoryFlow.js
+++ b/src/main/webapp/static/js/inventoryFlow/inventoryFlow.js
@@ -27,9 +27,11 @@
,{field: 'sourceLocNo$', align: 'center',title: '婧愬簱浣�'}
,{field: 'locNo$', align: 'center',title: '鐩爣搴撲綅'}
,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿'}
- ,{field: 'matnr', align: 'center',title: '鍟嗗搧缂栧彿'}
+ ,{field: 'matnr', align: 'center',title: 'sku'}
+ ,{field: 'supp', align: 'center',title: 'po'}
+ ,{field: 'sku', align: 'center',title: 'upc'}
,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О'}
- ,{field: 'batch', align: 'center',title: '鎵瑰彿'}
+ ,{field: 'batch', align: 'center',title: '鎵瑰彿',hide:true}
,{field: 'anfme', align: 'center',title: '鏁伴噺'}
,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉＄爜'}
,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳'}
diff --git a/src/main/webapp/static/js/locCheck/locCheck.js b/src/main/webapp/static/js/locCheck/locCheck.js
index 26a8ec1..2b50dce 100644
--- a/src/main/webapp/static/js/locCheck/locCheck.js
+++ b/src/main/webapp/static/js/locCheck/locCheck.js
@@ -24,7 +24,9 @@
{type: 'checkbox', hide: true}
, {field: 'id', align: 'center', title: '鍞竴ID', hide: true}
, {field: 'locNo', align: 'center', title: '搴撲綅鍙�'}
- , {field: 'matnr', align: 'center', title: '鐗╂枡鍙�'}
+ , {field: 'matnr', align: 'center', title: 'sku'}
+ ,{field: 'supp', align: 'center',title: 'po'}
+ ,{field: 'sku', align: 'center',title: 'upc'}
, {field: 'originAnfme', align: 'center', title: '鐩樼偣鍓嶆暟閲�'}
, {field: 'type$', align: 'center', title: '鐘舵��'}
, {field: 'realAnfme', align: 'center', title: '鐪熷疄鏁伴噺'}
diff --git a/src/main/webapp/static/js/locDetlGroup/locDetlGroup.js b/src/main/webapp/static/js/locDetlGroup/locDetlGroup.js
index 8998f94..b08f923 100644
--- a/src/main/webapp/static/js/locDetlGroup/locDetlGroup.js
+++ b/src/main/webapp/static/js/locDetlGroup/locDetlGroup.js
@@ -2,10 +2,12 @@
function getCol() {
var cols = [
- {field: 'matnr', align: 'center', title: '鐗╂枡鍙�', sort: true}
+ {field: 'matnr', align: 'center', title: 'sku', sort: true}
, {field: 'maktx', align: 'center', title: '鐗╂枡鍚嶇О', sort: true}
, {field: 'specs', align: 'center', title: '瑙勬牸'}
- , {field: 'batch', align: 'center', title: '鎵瑰彿', width: 300, sort: true}
+ ,{field: 'supp', align: 'center',title: 'po'}
+ ,{field: 'sku', align: 'center',title: 'upc'}
+ , {field: 'batch', align: 'center', title: '鎵瑰彿', width: 300, sort: true,hide:true}
, {field: 'storeMax', align: 'center', title: '鏁伴噺涓婇檺', sort: true}
, {field: 'storeMin', align: 'center', title: '鏁伴噺涓嬮檺', sort: true}
// , {field: 'storeMaxDate', align: 'center', title: '搴撻緞涓婇檺', sort: true}
diff --git a/src/main/webapp/static/js/locRule/locRule.js b/src/main/webapp/static/js/locRule/locRule.js
index 37b0dfc..0ac6b21 100644
--- a/src/main/webapp/static/js/locRule/locRule.js
+++ b/src/main/webapp/static/js/locRule/locRule.js
@@ -23,11 +23,13 @@
cols: [[
{type: 'checkbox'}
// ,{field: 'id', align: 'center',title: 'ID'}
- , {field: 'matnr', align: 'center', title: '鍟嗗搧缂栧彿'}
+ , {field: 'matnr', align: 'center', title: 'sku'}
+ ,{field: 'supp', align: 'center',title: 'po'}
+ ,{field: 'sku', align: 'center',title: 'upc'}
, {field: 'specs', align: 'center', title: '瑙勬牸'}
, {field: 'model', align: 'center', title: '鍨嬪彿'}
, {field: 'cstmr', align: 'center', title: '瀹㈡埛'}
- , {field: 'batch', align: 'center', title: '鎵瑰彿'}
+ , {field: 'batch', align: 'center', title: '鎵瑰彿',hide:true}
, {field: 'other', align: 'center', title: '鍏朵粬', hide: true}
, {field: 'rowBeg', align: 'center', title: '寮�濮嬫帓'}
, {field: 'rowEnd', align: 'center', title: '缁撴潫鎺�'}
diff --git a/src/main/webapp/static/js/manLocDetl/manLocDetl.js b/src/main/webapp/static/js/manLocDetl/manLocDetl.js
index eee69ea..623e11f 100644
--- a/src/main/webapp/static/js/manLocDetl/manLocDetl.js
+++ b/src/main/webapp/static/js/manLocDetl/manLocDetl.js
@@ -2,7 +2,7 @@
function getCol() {
var cols = [
{field: 'locNo', align: 'center',title: '搴撲綅鍙�'},
- {field: 'matnr', align: 'center',title: '鍟嗗搧缂栧彿', sort:true}
+ {field: 'matnr', align: 'center',title: 'sku', sort:true}
,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О', sort:true}
,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', hide: false}
,{field: 'batch', align: 'center',title: '鎵瑰彿', width: 300, sort:true}
@@ -14,7 +14,7 @@
,{field: 'brand', align: 'center',title: '鍝佺墝', hide: true}
,{field: 'unit', align: 'center',title: '鍗曚綅', hide: true}
,{field: 'price', align: 'center',title: '鍗曚环', hide: true}
- ,{field: 'sku', align: 'center',title: '宸ュ簭', hide: false}
+ ,{field: 'sku', align: 'center',title: 'upc', hide: false}
,{field: 'units', align: 'center',title: '鍗曚綅閲�', hide: true}
,{field: 'barcode', align: 'center',title: '鏉＄爜', hide: true}
,{field: 'origin', align: 'center',title: '鍦ㄥ簱鏍囪', hide: false}
@@ -26,7 +26,7 @@
,{field: 'length', align: 'center',title: '鍗曠姣涢噸', hide: true}
,{field: 'volume', align: 'center',title: '鍗曠浣撶Н', hide: true}
,{field: 'threeCode', align: 'center',title: '绠卞瓙灏哄', hide: true}
- ,{field: 'supp', align: 'center',title: '渚涘簲鍟�', hide: true}
+ ,{field: 'supp', align: 'center',title: 'po', hide: true}
,{field: 'suppCode', align: 'center',title: '渚涘簲鍟嗙紪鐮�', hide: true}
,{field: 'beBatch$', align: 'center',title: '鏄惁鎵规', hide: true}
,{field: 'deadTime', align: 'center',title: '淇濊川鏈�', hide: true}
diff --git a/src/main/webapp/static/js/matTurn/matTurn.js b/src/main/webapp/static/js/matTurn/matTurn.js
index 906f369..12e16f2 100644
--- a/src/main/webapp/static/js/matTurn/matTurn.js
+++ b/src/main/webapp/static/js/matTurn/matTurn.js
@@ -5,13 +5,15 @@
{
field: 'matnr',
align: 'center',
- title: '鍝佸彿',
+ title: 'sku',
edit: 'text',
width: 130,
style: 'color: blue;font-weight: bold'
}
, {field: 'maktx', align: 'center', title: '鍝佸悕'}
- , {field: 'specs', align: 'center', title: '鍝佸悕'}
+ // , {field: 'specs', align: 'center', title: '鍝佸悕'}
+ ,{field: 'supp', align: 'center',title: 'po'}
+ ,{field: 'sku', align: 'center',title: 'upc'}
];
}
diff --git a/src/main/webapp/static/js/order/order.js b/src/main/webapp/static/js/order/order.js
index 7fc8788..79e0c70 100644
--- a/src/main/webapp/static/js/order/order.js
+++ b/src/main/webapp/static/js/order/order.js
@@ -237,10 +237,12 @@
cellMinWidth: 100,
cols: [[
{type: 'numbers', title: '#'},
- {field: 'matnr', title: '鍟嗗搧缂栫爜', width: 160},
- {field: 'maktx', title: '鍟嗗搧鍚嶇О', width: 200},
- {field: 'batch', title: '鎵瑰彿', edit: true},
- {field: 'specs', title: '瑙勬牸'},
+ {field: 'matnr', title: 'sku', width: 160},
+ {field: 'maktx', title: '鍚嶇О', width: 80},
+ // {field: 'batch', title: '鎵瑰彿', edit: true},
+ // {field: 'specs', title: '瑙勬牸'},
+ {field: 'supp', title: 'po'},
+ {field: 'sku', title: 'upc'},
{field: 'anfme', title: '鏁伴噺(淇敼)', style: 'color: blue;font-weight: bold', edit: true, minWidth: 110, width: 110},
{field: 'workQty', title: '浣滀笟鏁伴噺', minWidth: 100, width: 100},
// {field: 'unit', title: '鍗曚綅', width: 80},
diff --git a/src/main/webapp/static/js/order/out.js b/src/main/webapp/static/js/order/out.js
index 897b349..5432eb5 100644
--- a/src/main/webapp/static/js/order/out.js
+++ b/src/main/webapp/static/js/order/out.js
@@ -32,11 +32,12 @@
{type: 'checkbox'}
,{type: 'numbers', title: '#'}
,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', templet: '#orderNoTpl', width: 160}
- ,{field: 'matnr', align: 'center',title: '鍟嗗搧缂栫爜', width: 160}
- ,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О', width: 200}
- ,{field: 'batch', align: 'center',title: '搴忓垪鐮�'}
- ,{field: 'specs', align: 'center',title: '瑙勬牸'}
- ,{field: 'sku', align: 'center',title: '宸ュ簭', hide: false}
+ ,{field: 'matnr', align: 'center',title: 'sku', width: 160}
+ ,{field: 'maktx', align: 'center',title: '鍚嶇О', width: 200}
+ ,{field: 'batch', align: 'center',title: '搴忓垪鐮�',hide:true}
+ ,{field: 'specs', align: 'center',title: '瑙勬牸',hide:true}
+ ,{field: 'supp', align: 'center',title: 'po', hide: false}
+ ,{field: 'sku', align: 'center',title: 'upc', hide: false}
// ,{field: 'anfme', align: 'center',title: '鏁伴噺'}
// ,{field: 'qty', align: 'center',title: '浣滀笟鏁伴噺', style: 'font-weight: bold'}
,{field: 'enableQty', align: 'center',title: '寰呭嚭鏁伴噺', style: 'font-weight: bold'}
@@ -160,7 +161,7 @@
// {type: 'checkbox', merge: ['orderNo']},
{field: 'orderNo', title: '鍗曟嵁缂栧彿', merge: true, align: 'center'},
{field: 'title', title: '鍟嗗搧', merge: true, align: 'center', width: 350},
- {field: 'batch', title: '搴忓垪鐮�', align: 'center'},
+ {field: 'batch', title: '搴忓垪鐮�', align: 'center',hide:true},
{field: 'anfme', title: '鏁伴噺', align: 'center', width: 90, style: 'font-weight: bold'},
{field: 'locNo', title: '璐т綅', align: 'center', width: 100, templet: '#locNoTpl'},
{field: 'staNos', align: 'center', title: '鍑哄簱绔�', merge: ['locNo'], templet: '#tbBasicTbStaNos'},
diff --git a/src/main/webapp/static/js/orderDetl/orderDetl.js b/src/main/webapp/static/js/orderDetl/orderDetl.js
index cb92b98..7f040ed 100644
--- a/src/main/webapp/static/js/orderDetl/orderDetl.js
+++ b/src/main/webapp/static/js/orderDetl/orderDetl.js
@@ -25,13 +25,14 @@
,{field: 'id', align: 'center',title: 'ID'}
,{field: 'orderId$', align: 'center',title: '璁㈠崟鍐呯爜'}
,{field: 'anfme', align: 'center',title: '鏁伴噺'}
- ,{field: 'matnr', align: 'center',title: '鍟嗗搧缂栫爜'}
- ,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О'}
+ ,{field: 'matnr', align: 'center',title: 'sku'}
+ ,{field: 'maktx', align: 'center',title: '鍚嶇О'}
,{field: 'name', align: 'center',title: '鍚嶇О'}
,{field: 'specs', align: 'center',title: '瑙勬牸'}
- ,{field: 'sku', align: 'center',title: '宸ュ簭', hide: false}
+ ,{field: 'supp', align: 'center',title: 'po', hide: false}
+ ,{field: 'sku', align: 'center',title: 'upc', hide: false}
,{field: 'model', align: 'center',title: '鍨嬪彿'}
- ,{field: 'batch', align: 'center',title: '鎵瑰彿'}
+ ,{field: 'batch', align: 'center',title: '鎵瑰彿',hide:true}
,{field: 'unit', align: 'center',title: '鍗曚綅'}
,{field: 'barcode', align: 'center',title: '鍟嗗搧鏉＄爜'}
,{field: 'supplier', align: 'center',title: '渚涘簲鍟�'}
diff --git a/src/main/webapp/static/js/orderDetlPakin/orderDetl.js b/src/main/webapp/static/js/orderDetlPakin/orderDetl.js
index cb92b98..7f040ed 100644
--- a/src/main/webapp/static/js/orderDetlPakin/orderDetl.js
+++ b/src/main/webapp/static/js/orderDetlPakin/orderDetl.js
@@ -25,13 +25,14 @@
,{field: 'id', align: 'center',title: 'ID'}
,{field: 'orderId$', align: 'center',title: '璁㈠崟鍐呯爜'}
,{field: 'anfme', align: 'center',title: '鏁伴噺'}
- ,{field: 'matnr', align: 'center',title: '鍟嗗搧缂栫爜'}
- ,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О'}
+ ,{field: 'matnr', align: 'center',title: 'sku'}
+ ,{field: 'maktx', align: 'center',title: '鍚嶇О'}
,{field: 'name', align: 'center',title: '鍚嶇О'}
,{field: 'specs', align: 'center',title: '瑙勬牸'}
- ,{field: 'sku', align: 'center',title: '宸ュ簭', hide: false}
+ ,{field: 'supp', align: 'center',title: 'po', hide: false}
+ ,{field: 'sku', align: 'center',title: 'upc', hide: false}
,{field: 'model', align: 'center',title: '鍨嬪彿'}
- ,{field: 'batch', align: 'center',title: '鎵瑰彿'}
+ ,{field: 'batch', align: 'center',title: '鎵瑰彿',hide:true}
,{field: 'unit', align: 'center',title: '鍗曚綅'}
,{field: 'barcode', align: 'center',title: '鍟嗗搧鏉＄爜'}
,{field: 'supplier', align: 'center',title: '渚涘簲鍟�'}
diff --git a/src/main/webapp/static/js/orderDetlPakout/orderDetl.js b/src/main/webapp/static/js/orderDetlPakout/orderDetl.js
index cb92b98..7f040ed 100644
--- a/src/main/webapp/static/js/orderDetlPakout/orderDetl.js
+++ b/src/main/webapp/static/js/orderDetlPakout/orderDetl.js
@@ -25,13 +25,14 @@
,{field: 'id', align: 'center',title: 'ID'}
,{field: 'orderId$', align: 'center',title: '璁㈠崟鍐呯爜'}
,{field: 'anfme', align: 'center',title: '鏁伴噺'}
- ,{field: 'matnr', align: 'center',title: '鍟嗗搧缂栫爜'}
- ,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О'}
+ ,{field: 'matnr', align: 'center',title: 'sku'}
+ ,{field: 'maktx', align: 'center',title: '鍚嶇О'}
,{field: 'name', align: 'center',title: '鍚嶇О'}
,{field: 'specs', align: 'center',title: '瑙勬牸'}
- ,{field: 'sku', align: 'center',title: '宸ュ簭', hide: false}
+ ,{field: 'supp', align: 'center',title: 'po', hide: false}
+ ,{field: 'sku', align: 'center',title: 'upc', hide: false}
,{field: 'model', align: 'center',title: '鍨嬪彿'}
- ,{field: 'batch', align: 'center',title: '鎵瑰彿'}
+ ,{field: 'batch', align: 'center',title: '鎵瑰彿',hide:true}
,{field: 'unit', align: 'center',title: '鍗曚綅'}
,{field: 'barcode', align: 'center',title: '鍟嗗搧鏉＄爜'}
,{field: 'supplier', align: 'center',title: '渚涘簲鍟�'}
diff --git a/src/main/webapp/static/js/orderPakin/order.js b/src/main/webapp/static/js/orderPakin/order.js
index 6b38ea5..fd49699 100644
--- a/src/main/webapp/static/js/orderPakin/order.js
+++ b/src/main/webapp/static/js/orderPakin/order.js
@@ -122,9 +122,11 @@
cellMinWidth: 100,
cols: [[
{type: 'numbers'},
- {field: 'matnr', title: '鍟嗗搧缂栫爜', width: 160},
- {field: 'maktx', title: '鍟嗗搧鍚嶇О', width: 160},
- {field: 'batch', title: '鎵瑰彿'},
+ {field: 'matnr', title: 'sku', width: 160},
+ {field: 'maktx', title: '鍚嶇О', width: 160},
+ // {field: 'batch', title: '鎵瑰彿'}
+ ,{field: 'supp', align: 'center',title: 'po', hide: false}
+ ,{field: 'sku', align: 'center',title: 'upc', hide: false},
{field: 'anfme', title: '鏁伴噺'},
{field: 'workQty', title: '浣滀笟鏁伴噺'},
{field: 'qty', title: '瀹屾垚鏁伴噺', style: 'font-weight: bold'},
@@ -234,10 +236,12 @@
cellMinWidth: 100,
cols: [[
{type: 'numbers', title: '#'},
- {field: 'matnr', title: '鍟嗗搧缂栫爜', width: 160},
- {field: 'maktx', title: '鍟嗗搧鍚嶇О', width: 200},
- {field: 'batch', title: '鎵瑰彿', edit: true},
- {field: 'specs', title: '瑙勬牸'},
+ {field: 'matnr', title: 'sku', width: 160},
+ {field: 'maktx', title: '鍚嶇О', width: 200}
+ ,{field: 'supp', align: 'center',title: 'po', hide: false}
+ ,{field: 'sku', align: 'center',title: 'upc', hide: false},
+ // {field: 'batch', title: '鎵瑰彿', edit: true},
+ // {field: 'specs', title: '瑙勬牸'},
{field: 'anfme', title: '鏁伴噺(淇敼)', style: 'color: blue;font-weight: bold', edit: true, minWidth: 110, width: 110},
{field: 'workQty', title: '浣滀笟鏁伴噺', minWidth: 100, width: 100},
// {field: 'unit', title: '鍗曚綅', width: 80},
diff --git a/src/main/webapp/static/js/orderPakin/out.js b/src/main/webapp/static/js/orderPakin/out.js
index a85b28a..dfc0c67 100644
--- a/src/main/webapp/static/js/orderPakin/out.js
+++ b/src/main/webapp/static/js/orderPakin/out.js
@@ -32,11 +32,12 @@
{type: 'checkbox'}
,{type: 'numbers', title: '#'}
,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', templet: '#orderNoTpl', width: 160}
- ,{field: 'matnr', align: 'center',title: '鍟嗗搧缂栫爜', width: 160}
- ,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О', width: 200}
- ,{field: 'batch', align: 'center',title: '搴忓垪鐮�'}
+ ,{field: 'matnr', align: 'center',title: 'sku', width: 160}
+ ,{field: 'maktx', align: 'center',title: '鍚嶇О', width: 200}
+ ,{field: 'batch', align: 'center',title: '搴忓垪鐮�',hide:true}
,{field: 'specs', align: 'center',title: '瑙勬牸'}
- ,{field: 'sku', align: 'center',title: '宸ュ簭', hide: false}
+ ,{field: 'supp', align: 'center',title: 'po', hide: false}
+ ,{field: 'sku', align: 'center',title: 'upc', hide: false}
// ,{field: 'anfme', align: 'center',title: '鏁伴噺'}
// ,{field: 'qty', align: 'center',title: '浣滀笟鏁伴噺', style: 'font-weight: bold'}
,{field: 'enableQty', align: 'center',title: '寰呭嚭鏁伴噺', style: 'font-weight: bold'}
@@ -160,7 +161,7 @@
// {type: 'checkbox', merge: ['orderNo']},
{field: 'orderNo', title: '鍗曟嵁缂栧彿', merge: true, align: 'center'},
{field: 'title', title: '鍟嗗搧', merge: true, align: 'center', width: 350},
- {field: 'batch', title: '搴忓垪鐮�', align: 'center'},
+ {field: 'batch', title: '搴忓垪鐮�', align: 'center',hide:true},
{field: 'anfme', title: '鏁伴噺', align: 'center', width: 90, style: 'font-weight: bold'},
{field: 'locNo', title: '璐т綅', align: 'center', width: 100, templet: '#locNoTpl'},
{field: 'staNos', align: 'center', title: '鍑哄簱绔�', merge: ['locNo'], templet: '#tbBasicTbStaNos'},
diff --git a/src/main/webapp/static/js/orderPakout/order.js b/src/main/webapp/static/js/orderPakout/order.js
index bedb1f0..5e991be 100644
--- a/src/main/webapp/static/js/orderPakout/order.js
+++ b/src/main/webapp/static/js/orderPakout/order.js
@@ -122,10 +122,12 @@
cellMinWidth: 100,
cols: [[
{type: 'numbers'},
- {field: 'matnr', title: '鍟嗗搧缂栫爜', width: 160},
- {field: 'maktx', title: '鍟嗗搧鍚嶇О', width: 160},
- {field: 'batch', title: '鎵瑰彿'},
- {field: 'anfme', title: '鏁伴噺'},
+ {field: 'matnr', title: 'sku', width: 160},
+ {field: 'maktx', title: '鍚嶇О', width: 80}
+ ,{field: 'supp', align: 'center',title: 'po', hide: false}
+ ,{field: 'sku', align: 'center',title: 'upc', hide: false},
+ // {field: 'batch', title: '鎵瑰彿'},
+ // {field: 'anfme', title: '鏁伴噺'},
{field: 'workQty', title: '浣滀笟鏁伴噺'},
{field: 'qty', title: '瀹屾垚鏁伴噺', style: 'font-weight: bold'},
// {field: 'unit', title: '鍗曚綅'},
@@ -235,9 +237,11 @@
cols: [[
{type: 'numbers', title: '#'},
{field: 'matnr', title: '鍟嗗搧缂栫爜', width: 160},
- {field: 'maktx', title: '鍟嗗搧鍚嶇О', width: 200},
- {field: 'batch', title: '鎵瑰彿', edit: true},
- {field: 'specs', title: '瑙勬牸'},
+ {field: 'maktx', title: '鍚嶇О', width: 80}
+ ,{field: 'supp', align: 'center',title: 'po', hide: false}
+ ,{field: 'sku', align: 'center',title: 'upc', hide: false},
+ // {field: 'batch', title: '鎵瑰彿', edit: true},
+ // {field: 'specs', title: '瑙勬牸'},
{field: 'anfme', title: '鏁伴噺(淇敼)', style: 'color: blue;font-weight: bold', edit: true, minWidth: 110, width: 110},
{field: 'workQty', title: '浣滀笟鏁伴噺', minWidth: 100, width: 100},
// {field: 'unit', title: '鍗曚綅', width: 80},
diff --git a/src/main/webapp/static/js/orderPakout/out.js b/src/main/webapp/static/js/orderPakout/out.js
index 4101a55..63d85d2 100644
--- a/src/main/webapp/static/js/orderPakout/out.js
+++ b/src/main/webapp/static/js/orderPakout/out.js
@@ -32,11 +32,12 @@
{type: 'checkbox'}
,{type: 'numbers', title: '#'}
,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', templet: '#orderNoTpl', width: 160}
- ,{field: 'matnr', align: 'center',title: '鍟嗗搧缂栫爜', width: 160}
+ ,{field: 'matnr', align: 'center',title: 'sku', width: 160}
,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О', width: 200}
- ,{field: 'batch', align: 'center',title: '搴忓垪鐮�'}
+ ,{field: 'batch', align: 'center',title: '搴忓垪鐮�',hide:true}
,{field: 'specs', align: 'center',title: '瑙勬牸'}
- ,{field: 'sku', align: 'center',title: '宸ュ簭', hide: false}
+ ,{field: 'supp', align: 'center',title: 'po', hide: false}
+ ,{field: 'sku', align: 'center',title: 'upc', hide: false}
// ,{field: 'anfme', align: 'center',title: '鏁伴噺'}
// ,{field: 'qty', align: 'center',title: '浣滀笟鏁伴噺', style: 'font-weight: bold'}
,{field: 'enableQty', align: 'center',title: '寰呭嚭鏁伴噺', style: 'font-weight: bold'}
@@ -160,7 +161,7 @@
// {type: 'checkbox', merge: ['orderNo']},
{field: 'orderNo', title: '鍗曟嵁缂栧彿', merge: true, align: 'center'},
{field: 'title', title: '鍟嗗搧', merge: true, align: 'center', width: 350},
- {field: 'batch', title: '搴忓垪鐮�', align: 'center'},
+ {field: 'batch', title: '搴忓垪鐮�', align: 'center',hide:true},
{field: 'anfme', title: '鏁伴噺', align: 'center', width: 90, style: 'font-weight: bold'},
{field: 'locNo', title: '璐т綅', align: 'center', width: 100, templet: '#locNoTpl'},
{field: 'frozen$', title: '鏄庣粏', align: 'center', width: 90, templet: '#locFrozen'},
diff --git a/src/main/webapp/static/js/pack/pack.js b/src/main/webapp/static/js/pack/pack.js
index 7236aae..0c91d9f 100644
--- a/src/main/webapp/static/js/pack/pack.js
+++ b/src/main/webapp/static/js/pack/pack.js
@@ -24,7 +24,9 @@
{type: 'checkbox'}
// ,{field: 'id', align: 'center',title: 'ID'}
,{field: 'barcode',title: '鏉＄爜'}
- ,{field: 'matnr', align: 'center',title: '鍟嗗搧缂栧彿', minWidth: 250, width: 250}
+ ,{field: 'matnr', align: 'center',title: 'sku', minWidth: 250, width: 250}
+ ,{field: 'supp', align: 'center',title: 'po', hide: false}
+ ,{field: 'sku', align: 'center',title: 'upc', hide: false}
,{field: 'batch', align: 'center',title: '鎵瑰彿', hide: true}
,{field: 'settle$', align: 'center',title: '鐘舵��', templet: '#settleTpl', minWidth: 160, width: 160}
// ,{field: 'status$', align: 'center',title: '鐘舵��'}
diff --git a/src/main/webapp/static/js/pakStore/turnOver.js b/src/main/webapp/static/js/pakStore/turnOver.js
index 9693198..4370d01 100644
--- a/src/main/webapp/static/js/pakStore/turnOver.js
+++ b/src/main/webapp/static/js/pakStore/turnOver.js
@@ -30,7 +30,7 @@
cellMinWidth: 50,
limit: 500,
cols: [[
- ,{field: 'matnr', align: 'center',title: '鍟嗗搧缂栧彿', sort:true}
+ ,{field: 'matnr', align: 'center',title: 'sku', sort:true}
,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О', sort:true}
,{field: 'loc_no', align: 'center',title: '搴撲綅鍙�', sort:true}
,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', hide: true}
@@ -41,7 +41,8 @@
,{field: 'weight', align: 'center',title: '閲嶉噺', hide: false}
,{field: 'owner$', align: 'center',title: '璐т富', hide: false}
,{field: 'payment$', align: 'center',title: '璐х墿褰㈡��', hide: false}
- ,{field: 'sku', align: 'center',title: '宸ュ簭', hide: false}
+ ,{field: 'supp', align: 'center',title: 'po', hide: false}
+ ,{field: 'sku', align: 'center',title: 'upc', hide: false}
,{field: 'memo', align: 'center',title: '澶囨敞', hide: false}
]],
done: function(res, curr, count) {
diff --git a/src/main/webapp/static/js/report/workCountIn.js b/src/main/webapp/static/js/report/workCountIn.js
index 0edc32b..a26029c 100644
--- a/src/main/webapp/static/js/report/workCountIn.js
+++ b/src/main/webapp/static/js/report/workCountIn.js
@@ -2,7 +2,7 @@
function getCol() {
var cols = [
{field: 'oneday', align: 'center', title: '鍏ュ簱鏃ユ湡', width: 200}
- ,{field: 'matnr', align: 'center',title: '鍟嗗搧缂栧彿'}
+ ,{field: 'matnr', align: 'center',title: 'sku'}
,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О'}
,{field: 'anfme', align: 'center',title: '鏁伴噺'}
];
diff --git a/src/main/webapp/static/js/report/workCountOut.js b/src/main/webapp/static/js/report/workCountOut.js
index 6534f00..99dd13d 100644
--- a/src/main/webapp/static/js/report/workCountOut.js
+++ b/src/main/webapp/static/js/report/workCountOut.js
@@ -2,7 +2,7 @@
function getCol() {
var cols = [
{field: 'oneday', align: 'center', title: '鍏ュ簱鏃ユ湡', width: 200}
- ,{field: 'matnr', align: 'center',title: '鍟嗗搧缂栧彿'}
+ ,{field: 'matnr', align: 'center',title: 'sku'}
,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О'}
,{field: 'anfme', align: 'center',title: '鏁伴噺'}
];
diff --git a/src/main/webapp/static/js/saas/locDetl.js b/src/main/webapp/static/js/saas/locDetl.js
index c08f23e..8e8e535 100644
--- a/src/main/webapp/static/js/saas/locDetl.js
+++ b/src/main/webapp/static/js/saas/locDetl.js
@@ -2,7 +2,7 @@
function getCol() {
var cols = [
{field: 'locNo', align: 'center',title: '搴撲綅鍙�'},
- {field: 'matnr', align: 'center',title: '鍟嗗搧缂栧彿', sort:true}
+ {field: 'matnr', align: 'center',title: 'sku', sort:true}
,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О', sort:true}
,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', hide: false, hide: true}
,{field: 'batch', align: 'center',title: '鎵瑰彿', width: 300, sort:true , hide: true}
@@ -14,7 +14,8 @@
,{field: 'brand', align: 'center',title: '鍝佺墝', hide: true}
,{field: 'unit', align: 'center',title: '鍗曚綅', hide: true}
,{field: 'price', align: 'center',title: '鍗曚环', hide: true}
- ,{field: 'sku', align: 'center',title: '宸ュ簭', hide: false}
+ ,{field: 'supp', align: 'center',title: 'po', hide: false}
+ ,{field: 'sku', align: 'center',title: 'upc', hide: false}
,{field: 'units', align: 'center',title: '鍗曚綅閲�', hide: true}
,{field: 'barcode', align: 'center',title: '鏉＄爜', hide: true}
,{field: 'origin', align: 'center',title: '鍦ㄥ簱鏍囪', hide: false}
@@ -26,7 +27,7 @@
,{field: 'length', align: 'center',title: '鍗曠姣涢噸', hide: true}
,{field: 'volume', align: 'center',title: '鍗曠浣撶Н', hide: true}
,{field: 'threeCode', align: 'center',title: '绠卞瓙灏哄', hide: true}
- ,{field: 'supp', align: 'center',title: '渚涘簲鍟�', hide: true}
+ // ,{field: 'supp', align: 'center',title: '渚涘簲鍟�', hide: true}
,{field: 'suppCode', align: 'center',title: '渚涘簲鍟嗙紪鐮�', hide: true}
,{field: 'beBatch$', align: 'center',title: '鏄惁鎵规', hide: true}
,{field: 'deadTime', align: 'center',title: '淇濊川鏈�', hide: true}
diff --git a/src/main/webapp/static/js/saasLog/saasLog.js b/src/main/webapp/static/js/saasLog/saasLog.js
index 6d2833e..f2cf67c 100644
--- a/src/main/webapp/static/js/saasLog/saasLog.js
+++ b/src/main/webapp/static/js/saasLog/saasLog.js
@@ -25,7 +25,7 @@
,{field: 'id', align: 'center',title: 'id', hide:true}
,{field: 'locNo', align: 'center',title: '搴撲綅'}
,{field: 'type$', align: 'center',title: '鎿嶄綔绫诲瀷'}
- ,{field: 'matnr', align: 'center',title: '鐗╂枡鍙�'}
+ ,{field: 'matnr', align: 'center',title: 'sku'}
,{field: 'anfme', align: 'center',title: '鏁伴噺'}
,{field: 'ioTime$', align: 'center',title: '鎿嶄綔鏃堕棿'}
,{field: 'createBy', align: 'center',title: '', hide:true}
diff --git a/src/main/webapp/static/js/stoMan/stoQue.js b/src/main/webapp/static/js/stoMan/stoQue.js
index 95d3552..c1873f6 100644
--- a/src/main/webapp/static/js/stoMan/stoQue.js
+++ b/src/main/webapp/static/js/stoMan/stoQue.js
@@ -216,7 +216,7 @@
cols: [[
// {type: 'checkbox'}
{field: 'locNo$', align: 'center',title: '搴撲綅鍙�'}
- ,{field: 'matnr', align: 'center',title: '鐗╂枡'}
+ ,{field: 'matnr', align: 'center',title: 'sku'}
,{field: 'lgnum', align: 'center',title: '浠撳簱鍙�'}
,{field: 'tbnum', align: 'center',title: '杞偍璇锋眰缂栧彿'}
// ,{field: 'tbpos', align: 'center',title: '琛岄」鐩�'}
diff --git a/src/main/webapp/static/js/wrkMast/wrkMast.js b/src/main/webapp/static/js/wrkMast/wrkMast.js
index 7fb5529..7e1b639 100644
--- a/src/main/webapp/static/js/wrkMast/wrkMast.js
+++ b/src/main/webapp/static/js/wrkMast/wrkMast.js
@@ -549,8 +549,9 @@
{type: 'checkbox'}
,{field: 'wrkNo', align: 'center',title: '宸ヤ綔鍙�'}
,{field: 'ioTime$', align: 'center',title: '宸ヤ綔鏃堕棿'}
- ,{field: 'matnr', align: 'center',title: '鐗╂枡'}
- ,{field: 'sku', align: 'center',title: '宸ュ簭', hide: false}
+ ,{field: 'matnr', align: 'center',title: 'sku'}
+ ,{field: 'supp', align: 'center',title: 'po', hide: false}
+ ,{field: 'sku', align: 'center',title: 'upc', hide: false}
,{field: 'lgnum', align: 'center',title: '浠撳簱鍙�'}
,{field: 'tbnum', align: 'center',title: '杞偍璇锋眰缂栧彿'}
,{field: 'tbpos', align: 'center',title: '琛岄」鐩�'}
diff --git a/src/main/webapp/views/matTurn/turnOverQuery.html b/src/main/webapp/views/matTurn/turnOverQuery.html
index 2ad1a5a..26b3a71 100644
--- a/src/main/webapp/views/matTurn/turnOverQuery.html
+++ b/src/main/webapp/views/matTurn/turnOverQuery.html
@@ -85,7 +85,7 @@
function getCol() {
return [
{type: 'checkbox'},
- {field: 'matnr', align: 'center', title: '鍝佸彿'}
+ {field: 'matnr', align: 'center', title: 'sku'}
, {field: 'maktx', align: 'center', title: '鍝佸悕'}
, {field: 'specs', align: 'center', title: '瑙勬牸'}
];
diff --git a/src/main/webapp/views/pakStore/turnOverOwner.html b/src/main/webapp/views/pakStore/turnOverOwner.html
index bf915a0..1fbb041 100644
--- a/src/main/webapp/views/pakStore/turnOverOwner.html
+++ b/src/main/webapp/views/pakStore/turnOverOwner.html
@@ -123,7 +123,7 @@
cellMinWidth: 50,
cols: [[
{type: 'checkbox',width: 50}
- ,{field: 'matnr', align: 'center',title: '鍟嗗搧缂栧彿', sort:true}
+ ,{field: 'matnr', align: 'center',title: 'sku', sort:true}
,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О', sort:true}
,{field: 'loc_no', align: 'center',title: '搴撲綅鍙�', sort:true}
,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', hide: true}
diff --git a/src/main/webapp/views/pda/comb.html b/src/main/webapp/views/pda/comb.html
index 4739ffb..5e1f752 100644
--- a/src/main/webapp/views/pda/comb.html
+++ b/src/main/webapp/views/pda/comb.html
@@ -55,7 +55,7 @@
cellMinWidth: 50,
cols: [[
{fixed: 'left', align: 'center', field: 'count', title: '鏁伴噺', style:'color: blue', width:50},
- {field: 'matnr', align: 'center', title: '鍟嗗搧缂栧彿'},
+ {field: 'matnr', align: 'center', title: 'sku'},
{field: 'maktx', align: 'center', title: '鍟嗗搧鍚嶇О'}
]],
done: function (res, curr, count) {
diff --git a/src/main/webapp/views/pda/stockIn.html b/src/main/webapp/views/pda/stockIn.html
index 9384793..11bf752 100644
--- a/src/main/webapp/views/pda/stockIn.html
+++ b/src/main/webapp/views/pda/stockIn.html
@@ -120,7 +120,7 @@
cellMinWidth: 50,
cols: [[
{fixed: 'left', align: 'center', field: 'count', title: '鏁伴噺', style:'color: blue', width:50},
- {field: 'matnr', align: 'center', title: '鍟嗗搧缂栧彿'},
+ {field: 'matnr', align: 'center', title: 'sku'},
{field: 'maktx', align: 'center', title: '鍟嗗搧鍚嶇О'}
]],
done: function (res, curr, count) {
diff --git a/src/main/webapp/views/pda/stockOut.html b/src/main/webapp/views/pda/stockOut.html
index 54cd9c7..9d1f852 100644
--- a/src/main/webapp/views/pda/stockOut.html
+++ b/src/main/webapp/views/pda/stockOut.html
@@ -130,7 +130,7 @@
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: 'matnr', align: 'center', title: 'sku', event: 'detail'},
{field: 'maktx', align: 'center', title: '鍚嶇О', event: 'detail'},
{field: 'locNo', align: 'center', title: '搴撲綅', event: 'detail'}
]],
--
Gitblit v1.9.1