From 1ca8b748a3541b88b12b7e9e7f5f77a5c8df7fd2 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期五, 31 十月 2025 15:29:28 +0800
Subject: [PATCH] #1
---
src/main/webapp/static/js/orderDetlPakout/orderDetl.js | 4
src/main/webapp/static/js/pack/pack.js | 4
src/main/webapp/static/js/orderDetlPakin/orderDetl.js | 4
src/main/resources/mapper/LocDetlMapper.xml | 10 +++
src/main/webapp/static/js/inventoryFlow/inventoryFlow.js | 4
src/main/webapp/static/js/saas/locDetl.js | 6 +-
src/main/webapp/static/js/wrkMast/wrkMast.js | 4
src/main/webapp/static/js/orderDetl/orderDetl.js | 4
src/main/webapp/static/js/locCheck/locCheck.js | 4
src/main/webapp/static/js/locDetlGroup/locDetlGroup.js | 4
src/main/webapp/static/js/matTurn/matTurn.js | 4
src/main/webapp/static/js/order/out.js | 4
src/main/webapp/static/js/adjDetl/adjDetl.js | 4
src/main/webapp/static/js/common.js | 8 +-
src/main/webapp/static/js/errorWrkMast/errorWrkMast.js | 4
src/main/webapp/static/js/orderPakin/order.js | 8 +-
src/main/webapp/static/js/basAgvWrkDetl/basAgvWrkDetl.js | 4
src/main/webapp/static/js/manLocDetl/manLocDetl.js | 4
src/main/webapp/static/js/orderPakin/out.js | 4
src/main/webapp/static/js/locDetl/locDetl.js | 4
src/main/webapp/static/js/locRule/locRule.js | 4
src/main/webapp/static/js/orderPakout/order.js | 8 +-
src/main/webapp/static/js/orderPakout/out.js | 4
src/main/webapp/static/js/handWrkMast/handWrkMast.js | 4
src/main/webapp/static/js/order/order.js | 8 +-
src/main/webapp/static/js/pakStore/turnOver.js | 4
src/main/webapp/static/js/basAgvLocDetl/basAgvLocDetl.js | 4
27 files changed, 70 insertions(+), 62 deletions(-)
diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index 958190a..6b10d25 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -342,6 +342,12 @@
<if test="specs!=null and specs!='' ">
and a.specs like '%' + #{specs} + '%'
</if>
+ <if test="standby1!=null and standby1!='' ">
+ and a.standby1 like '%' + #{standby1} + '%'
+ </if>
+ <if test="standby2!=null and standby2!='' ">
+ and a.standby2 like '%' + #{standby2} + '%'
+ </if>
</sql>
<select id="getStockOutPage" resultMap="BaseResultMap">
@@ -375,11 +381,13 @@
ROW_NUMBER() over (order by sum(a.anfme) desc) as row
, a.matnr
, a.batch
+ , a.standby1
+ , a.standby2
, sum(a.anfme) as anfme
from asr_loc_detl a
where 1=1
<include refid="stockOutCondition"></include>
- group by a.matnr, a.batch
+ group by a.matnr, a.batch, a.standby1, a.standby2
) t where t.row between ((#{pageNumber}-1)*#{pageSize}+1) and (#{pageNumber}*#{pageSize})
</select>
diff --git a/src/main/webapp/static/js/adjDetl/adjDetl.js b/src/main/webapp/static/js/adjDetl/adjDetl.js
index 6355fe2..bdcc21a 100644
--- a/src/main/webapp/static/js/adjDetl/adjDetl.js
+++ b/src/main/webapp/static/js/adjDetl/adjDetl.js
@@ -24,8 +24,8 @@
{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: 'standby1', align: 'center',title: 'po',hide:false}
+ ,{field: 'standby2', align: 'center',title: 'upc',hide:false}
,{field: 'batch', align: 'center',title: '鎵瑰彿',hide:true}
// ,{field: 'oriCtns', align: 'center',title: '鍘熺鏁�'}
,{field: 'oriQty', align: 'center',title: '鍘熸暟閲�',hide:false}
diff --git a/src/main/webapp/static/js/basAgvLocDetl/basAgvLocDetl.js b/src/main/webapp/static/js/basAgvLocDetl/basAgvLocDetl.js
index fba3177..2378547 100644
--- a/src/main/webapp/static/js/basAgvLocDetl/basAgvLocDetl.js
+++ b/src/main/webapp/static/js/basAgvLocDetl/basAgvLocDetl.js
@@ -35,7 +35,7 @@
,{field: 'brand', align: 'center',title: ''}
,{field: 'unit', align: 'center',title: ''}
,{field: 'price', align: 'center',title: ''}
- ,{field: 'sku', align: 'center',title: 'upc'}
+ ,{field: 'standby2', 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: 'po'}
+ ,{field: 'standby1', 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 11fd1fe..c27624c 100644
--- a/src/main/webapp/static/js/basAgvWrkDetl/basAgvWrkDetl.js
+++ b/src/main/webapp/static/js/basAgvWrkDetl/basAgvWrkDetl.js
@@ -36,7 +36,7 @@
,{field: 'brand', align: 'center',title: '鍝佺墝'}
,{field: 'unit', align: 'center',title: '鍗曚綅'}
,{field: 'price', align: 'center',title: '鍗曚环'}
- ,{field: 'sku', align: 'center',title: 'upc'}
+ ,{field: 'standby2', 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: 'po'}
+ ,{field: 'standby1', 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 c26e962..3fca8b5 100644
--- a/src/main/webapp/static/js/common.js
+++ b/src/main/webapp/static/js/common.js
@@ -193,7 +193,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: '鏉＄爜upc', hide: false}
+ ,{field: 'standby2', 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: true}
@@ -205,7 +205,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: '瀹㈡埛po', hide: false}
+ ,{field: 'standby1', align: 'center',title: '瀹㈡埛po', hide: false}
,{field: 'suppCode', align: 'center',title: '渚涘簲鍟嗙紪鐮�', hide: true}
,{field: 'beBatch$', align: 'center',title: '鏄惁鎵规', hide: true}
,{field: 'deadTime', align: 'center',title: '淇濊川鏈�', hide: true}
@@ -235,7 +235,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: '鏉＄爜upc', hide: false}
+ ,{field: 'standby2', 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: true}
@@ -247,7 +247,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: '瀹㈡埛po', hide: false}
+ ,{field: 'standby1', align: 'center',title: '瀹㈡埛po', hide: false}
,{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/errorWrkMast/errorWrkMast.js b/src/main/webapp/static/js/errorWrkMast/errorWrkMast.js
index b73b554..cfbfca8 100644
--- a/src/main/webapp/static/js/errorWrkMast/errorWrkMast.js
+++ b/src/main/webapp/static/js/errorWrkMast/errorWrkMast.js
@@ -360,8 +360,8 @@
,{field: 'wrkNo', align: 'center',title: '宸ヤ綔鍙�'}
,{field: 'ioTime$', align: 'center',title: '宸ヤ綔鏃堕棿'}
,{field: 'matnr', align: 'center',title: 'sku'}
- ,{field: 'supp', align: 'center',title: 'po'}
- ,{field: 'sku', align: 'center',title: 'upc'}
+ ,{field: 'standby1', align: 'center',title: 'po'}
+ ,{field: 'standby2', 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 7748e29..6d6685c 100644
--- a/src/main/webapp/static/js/handWrkMast/handWrkMast.js
+++ b/src/main/webapp/static/js/handWrkMast/handWrkMast.js
@@ -356,8 +356,8 @@
,{field: 'wrkNo', align: 'center',title: '宸ヤ綔鍙�'}
,{field: 'ioTime$', align: 'center',title: '宸ヤ綔鏃堕棿'}
,{field: 'matnr', align: 'center',title: 'sku'}
- ,{field: 'supp', align: 'center',title: 'po'}
- ,{field: 'sku', align: 'center',title: 'upc'}
+ ,{field: 'standby1', align: 'center',title: 'po'}
+ ,{field: 'standby2', 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 ffa47dd..b179e9f 100644
--- a/src/main/webapp/static/js/inventoryFlow/inventoryFlow.js
+++ b/src/main/webapp/static/js/inventoryFlow/inventoryFlow.js
@@ -28,8 +28,8 @@
,{field: 'locNo$', align: 'center',title: '鐩爣搴撲綅'}
,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿'}
,{field: 'matnr', align: 'center',title: 'sku'}
- ,{field: 'supp', align: 'center',title: 'po'}
- ,{field: 'sku', align: 'center',title: 'upc'}
+ ,{field: 'standby1', align: 'center',title: 'po'}
+ ,{field: 'standby2', align: 'center',title: 'upc'}
,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О'}
,{field: 'batch', align: 'center',title: '鎵瑰彿',hide:true}
,{field: 'anfme', align: 'center',title: '鏁伴噺'}
diff --git a/src/main/webapp/static/js/locCheck/locCheck.js b/src/main/webapp/static/js/locCheck/locCheck.js
index 2b50dce..ef11851 100644
--- a/src/main/webapp/static/js/locCheck/locCheck.js
+++ b/src/main/webapp/static/js/locCheck/locCheck.js
@@ -25,8 +25,8 @@
, {field: 'id', align: 'center', title: '鍞竴ID', hide: true}
, {field: 'locNo', align: 'center', title: '搴撲綅鍙�'}
, {field: 'matnr', align: 'center', title: 'sku'}
- ,{field: 'supp', align: 'center',title: 'po'}
- ,{field: 'sku', align: 'center',title: 'upc'}
+ ,{field: 'standby1', align: 'center',title: 'po'}
+ ,{field: 'standby2', 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/locDetl/locDetl.js b/src/main/webapp/static/js/locDetl/locDetl.js
index dc5b48f..eb83cff 100644
--- a/src/main/webapp/static/js/locDetl/locDetl.js
+++ b/src/main/webapp/static/js/locDetl/locDetl.js
@@ -16,7 +16,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: '鏉＄爜upc', hide: false}
+ ,{field: 'standby2', 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}
@@ -28,7 +28,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: '瀹㈡埛po', hide: true}
+ ,{field: 'standby1', 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/locDetlGroup/locDetlGroup.js b/src/main/webapp/static/js/locDetlGroup/locDetlGroup.js
index b08f923..fd1ceb4 100644
--- a/src/main/webapp/static/js/locDetlGroup/locDetlGroup.js
+++ b/src/main/webapp/static/js/locDetlGroup/locDetlGroup.js
@@ -5,8 +5,8 @@
{field: 'matnr', align: 'center', title: 'sku', sort: true}
, {field: 'maktx', align: 'center', title: '鐗╂枡鍚嶇О', sort: true}
, {field: 'specs', align: 'center', title: '瑙勬牸'}
- ,{field: 'supp', align: 'center',title: 'po'}
- ,{field: 'sku', align: 'center',title: 'upc'}
+ ,{field: 'standby1', align: 'center',title: 'po'}
+ ,{field: 'standby2', 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}
diff --git a/src/main/webapp/static/js/locRule/locRule.js b/src/main/webapp/static/js/locRule/locRule.js
index 0ac6b21..dbae2be 100644
--- a/src/main/webapp/static/js/locRule/locRule.js
+++ b/src/main/webapp/static/js/locRule/locRule.js
@@ -24,8 +24,8 @@
{type: 'checkbox'}
// ,{field: 'id', align: 'center',title: 'ID'}
, {field: 'matnr', align: 'center', title: 'sku'}
- ,{field: 'supp', align: 'center',title: 'po'}
- ,{field: 'sku', align: 'center',title: 'upc'}
+ ,{field: 'standby1', align: 'center',title: 'po'}
+ ,{field: 'standby2', align: 'center',title: 'upc'}
, {field: 'specs', align: 'center', title: '瑙勬牸'}
, {field: 'model', align: 'center', title: '鍨嬪彿'}
, {field: 'cstmr', align: 'center', title: '瀹㈡埛'}
diff --git a/src/main/webapp/static/js/manLocDetl/manLocDetl.js b/src/main/webapp/static/js/manLocDetl/manLocDetl.js
index 623e11f..e1f0f9f 100644
--- a/src/main/webapp/static/js/manLocDetl/manLocDetl.js
+++ b/src/main/webapp/static/js/manLocDetl/manLocDetl.js
@@ -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: 'upc', hide: false}
+ ,{field: 'standby2', 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: 'po', hide: true}
+ ,{field: 'standby1', 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 12e16f2..f1a9874 100644
--- a/src/main/webapp/static/js/matTurn/matTurn.js
+++ b/src/main/webapp/static/js/matTurn/matTurn.js
@@ -12,8 +12,8 @@
}
, {field: 'maktx', align: 'center', title: '鍝佸悕'}
// , {field: 'specs', align: 'center', title: '鍝佸悕'}
- ,{field: 'supp', align: 'center',title: 'po'}
- ,{field: 'sku', align: 'center',title: 'upc'}
+ ,{field: 'standby1', align: 'center',title: 'po'}
+ ,{field: 'standby2', 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 79e0c70..752301b 100644
--- a/src/main/webapp/static/js/order/order.js
+++ b/src/main/webapp/static/js/order/order.js
@@ -127,8 +127,8 @@
{type: 'numbers'},
{field: 'matnr', title: 'sku', width: 160},
{field: 'maktx', title: '鍚嶇О', width: 80},
- {field: 'supp', title: 'po'},
- {field: 'sku', title: 'upc'},
+ {field: 'standby1', title: 'po'},
+ {field: 'standby2', title: 'upc'},
{field: 'anfme', title: '鏁伴噺', width: 80},
{field: 'qty', title: '涓婃姤鏁伴噺', style: 'font-weight: bold'},
{field: 'workQty', title: '鍘嗗彶涓婃姤鏁伴噺'},
@@ -241,8 +241,8 @@
{field: 'maktx', title: '鍚嶇О', width: 80},
// {field: 'batch', title: '鎵瑰彿', edit: true},
// {field: 'specs', title: '瑙勬牸'},
- {field: 'supp', title: 'po'},
- {field: 'sku', title: 'upc'},
+ {field: 'standby1', title: 'po'},
+ {field: 'standby2', 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 5432eb5..741d458 100644
--- a/src/main/webapp/static/js/order/out.js
+++ b/src/main/webapp/static/js/order/out.js
@@ -36,8 +36,8 @@
,{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: 'standby1', align: 'center',title: 'po', hide: false}
+ ,{field: 'standby2', 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'}
diff --git a/src/main/webapp/static/js/orderDetl/orderDetl.js b/src/main/webapp/static/js/orderDetl/orderDetl.js
index 7f040ed..df68fa1 100644
--- a/src/main/webapp/static/js/orderDetl/orderDetl.js
+++ b/src/main/webapp/static/js/orderDetl/orderDetl.js
@@ -29,8 +29,8 @@
,{field: 'maktx', align: 'center',title: '鍚嶇О'}
,{field: 'name', align: 'center',title: '鍚嶇О'}
,{field: 'specs', align: 'center',title: '瑙勬牸'}
- ,{field: 'supp', align: 'center',title: 'po', hide: false}
- ,{field: 'sku', align: 'center',title: 'upc', hide: false}
+ ,{field: 'standby1', align: 'center',title: 'po', hide: false}
+ ,{field: 'standby2', align: 'center',title: 'upc', hide: false}
,{field: 'model', align: 'center',title: '鍨嬪彿'}
,{field: 'batch', align: 'center',title: '鎵瑰彿',hide:true}
,{field: 'unit', align: 'center',title: '鍗曚綅'}
diff --git a/src/main/webapp/static/js/orderDetlPakin/orderDetl.js b/src/main/webapp/static/js/orderDetlPakin/orderDetl.js
index 7f040ed..df68fa1 100644
--- a/src/main/webapp/static/js/orderDetlPakin/orderDetl.js
+++ b/src/main/webapp/static/js/orderDetlPakin/orderDetl.js
@@ -29,8 +29,8 @@
,{field: 'maktx', align: 'center',title: '鍚嶇О'}
,{field: 'name', align: 'center',title: '鍚嶇О'}
,{field: 'specs', align: 'center',title: '瑙勬牸'}
- ,{field: 'supp', align: 'center',title: 'po', hide: false}
- ,{field: 'sku', align: 'center',title: 'upc', hide: false}
+ ,{field: 'standby1', align: 'center',title: 'po', hide: false}
+ ,{field: 'standby2', align: 'center',title: 'upc', hide: false}
,{field: 'model', align: 'center',title: '鍨嬪彿'}
,{field: 'batch', align: 'center',title: '鎵瑰彿',hide:true}
,{field: 'unit', align: 'center',title: '鍗曚綅'}
diff --git a/src/main/webapp/static/js/orderDetlPakout/orderDetl.js b/src/main/webapp/static/js/orderDetlPakout/orderDetl.js
index 7f040ed..df68fa1 100644
--- a/src/main/webapp/static/js/orderDetlPakout/orderDetl.js
+++ b/src/main/webapp/static/js/orderDetlPakout/orderDetl.js
@@ -29,8 +29,8 @@
,{field: 'maktx', align: 'center',title: '鍚嶇О'}
,{field: 'name', align: 'center',title: '鍚嶇О'}
,{field: 'specs', align: 'center',title: '瑙勬牸'}
- ,{field: 'supp', align: 'center',title: 'po', hide: false}
- ,{field: 'sku', align: 'center',title: 'upc', hide: false}
+ ,{field: 'standby1', align: 'center',title: 'po', hide: false}
+ ,{field: 'standby2', align: 'center',title: 'upc', hide: false}
,{field: 'model', align: 'center',title: '鍨嬪彿'}
,{field: 'batch', align: 'center',title: '鎵瑰彿',hide:true}
,{field: 'unit', align: 'center',title: '鍗曚綅'}
diff --git a/src/main/webapp/static/js/orderPakin/order.js b/src/main/webapp/static/js/orderPakin/order.js
index fd49699..f4181dc 100644
--- a/src/main/webapp/static/js/orderPakin/order.js
+++ b/src/main/webapp/static/js/orderPakin/order.js
@@ -125,8 +125,8 @@
{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: 'standby1', align: 'center',title: 'po', hide: false},
+ {field: 'standby2', align: 'center',title: 'upc', hide: false},
{field: 'anfme', title: '鏁伴噺'},
{field: 'workQty', title: '浣滀笟鏁伴噺'},
{field: 'qty', title: '瀹屾垚鏁伴噺', style: 'font-weight: bold'},
@@ -238,8 +238,8 @@
{type: 'numbers', 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: 'standby1', align: 'center',title: 'po', hide: false}
+ ,{field: 'standby2', 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},
diff --git a/src/main/webapp/static/js/orderPakin/out.js b/src/main/webapp/static/js/orderPakin/out.js
index dfc0c67..9a10af0 100644
--- a/src/main/webapp/static/js/orderPakin/out.js
+++ b/src/main/webapp/static/js/orderPakin/out.js
@@ -36,8 +36,8 @@
,{field: 'maktx', align: 'center',title: '鍚嶇О', width: 200}
,{field: 'batch', align: 'center',title: '搴忓垪鐮�',hide:true}
,{field: 'specs', align: 'center',title: '瑙勬牸'}
- ,{field: 'supp', align: 'center',title: 'po', hide: false}
- ,{field: 'sku', align: 'center',title: 'upc', hide: false}
+ ,{field: 'standby1', align: 'center',title: 'po', hide: false}
+ ,{field: 'standby2', 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'}
diff --git a/src/main/webapp/static/js/orderPakout/order.js b/src/main/webapp/static/js/orderPakout/order.js
index 5e991be..eb5e758 100644
--- a/src/main/webapp/static/js/orderPakout/order.js
+++ b/src/main/webapp/static/js/orderPakout/order.js
@@ -124,8 +124,8 @@
{type: 'numbers'},
{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: 'standby1', align: 'center',title: 'po', hide: false}
+ ,{field: 'standby2', align: 'center',title: 'upc', hide: false},
// {field: 'batch', title: '鎵瑰彿'},
// {field: 'anfme', title: '鏁伴噺'},
{field: 'workQty', title: '浣滀笟鏁伴噺'},
@@ -238,8 +238,8 @@
{type: 'numbers', title: '#'},
{field: 'matnr', title: '鍟嗗搧缂栫爜', width: 160},
{field: 'maktx', title: '鍚嶇О', width: 80}
- ,{field: 'supp', align: 'center',title: 'po', hide: false}
- ,{field: 'sku', align: 'center',title: 'upc', hide: false},
+ ,{field: 'standby1', align: 'center',title: 'po', hide: false}
+ ,{field: 'standby2', 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},
diff --git a/src/main/webapp/static/js/orderPakout/out.js b/src/main/webapp/static/js/orderPakout/out.js
index 63d85d2..c58479e 100644
--- a/src/main/webapp/static/js/orderPakout/out.js
+++ b/src/main/webapp/static/js/orderPakout/out.js
@@ -36,8 +36,8 @@
,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О', width: 200}
,{field: 'batch', align: 'center',title: '搴忓垪鐮�',hide:true}
,{field: 'specs', align: 'center',title: '瑙勬牸'}
- ,{field: 'supp', align: 'center',title: 'po', hide: false}
- ,{field: 'sku', align: 'center',title: 'upc', hide: false}
+ ,{field: 'standby1', align: 'center',title: 'po', hide: false}
+ ,{field: 'standby2', 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'}
diff --git a/src/main/webapp/static/js/pack/pack.js b/src/main/webapp/static/js/pack/pack.js
index 0c91d9f..ecc2117 100644
--- a/src/main/webapp/static/js/pack/pack.js
+++ b/src/main/webapp/static/js/pack/pack.js
@@ -25,8 +25,8 @@
// ,{field: 'id', align: 'center',title: 'ID'}
,{field: 'barcode',title: '鏉＄爜'}
,{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: 'standby1', align: 'center',title: 'po', hide: false}
+ ,{field: 'standby2', 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 4370d01..602c13e 100644
--- a/src/main/webapp/static/js/pakStore/turnOver.js
+++ b/src/main/webapp/static/js/pakStore/turnOver.js
@@ -41,8 +41,8 @@
,{field: 'weight', align: 'center',title: '閲嶉噺', hide: false}
,{field: 'owner$', align: 'center',title: '璐т富', hide: false}
,{field: 'payment$', align: 'center',title: '璐х墿褰㈡��', hide: false}
- ,{field: 'supp', align: 'center',title: 'po', hide: false}
- ,{field: 'sku', align: 'center',title: 'upc', hide: false}
+ ,{field: 'standby1', align: 'center',title: 'po', hide: false}
+ ,{field: 'standby2', 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/saas/locDetl.js b/src/main/webapp/static/js/saas/locDetl.js
index 8e8e535..a3aee1c 100644
--- a/src/main/webapp/static/js/saas/locDetl.js
+++ b/src/main/webapp/static/js/saas/locDetl.js
@@ -14,8 +14,8 @@
,{field: 'brand', align: 'center',title: '鍝佺墝', hide: true}
,{field: 'unit', align: 'center',title: '鍗曚綅', hide: true}
,{field: 'price', align: 'center',title: '鍗曚环', hide: true}
- ,{field: 'supp', align: 'center',title: 'po', hide: false}
- ,{field: 'sku', align: 'center',title: 'upc', hide: false}
+ ,{field: 'standby1', align: 'center',title: 'po', hide: false}
+ ,{field: 'standby2', 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}
@@ -27,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/wrkMast/wrkMast.js b/src/main/webapp/static/js/wrkMast/wrkMast.js
index 7e1b639..8ea8c4a 100644
--- a/src/main/webapp/static/js/wrkMast/wrkMast.js
+++ b/src/main/webapp/static/js/wrkMast/wrkMast.js
@@ -550,8 +550,8 @@
,{field: 'wrkNo', align: 'center',title: '宸ヤ綔鍙�'}
,{field: 'ioTime$', align: 'center',title: '宸ヤ綔鏃堕棿'}
,{field: 'matnr', align: 'center',title: 'sku'}
- ,{field: 'supp', align: 'center',title: 'po', hide: false}
- ,{field: 'sku', align: 'center',title: 'upc', hide: false}
+ ,{field: 'standby1', align: 'center',title: 'po', hide: false}
+ ,{field: 'standby2', align: 'center',title: 'upc', hide: false}
,{field: 'lgnum', align: 'center',title: '浠撳簱鍙�'}
,{field: 'tbnum', align: 'center',title: '杞偍璇锋眰缂栧彿'}
,{field: 'tbpos', align: 'center',title: '琛岄」鐩�'}
--
Gitblit v1.9.1