From 9126e6315288e1ea50e74c70b099974522d6b172 Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期一, 08 十二月 2025 09:17:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jshdasrs' into jshdasrs
---
src/main/webapp/static/js/orderPakin/order.js | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/main/webapp/static/js/orderPakin/order.js b/src/main/webapp/static/js/orderPakin/order.js
index 78df7df..c655147 100644
--- a/src/main/webapp/static/js/orderPakin/order.js
+++ b/src/main/webapp/static/js/orderPakin/order.js
@@ -43,7 +43,7 @@
cols: [[
{type: 'numbers'},
{field: 'orderNo', title: '鍗曟嵁缂栧彿', templet: '#orderNoTpl'},
- {field: 'itemName', align: 'center', title: '瀹㈡埛po', minWidth: 160, width: 160},
+ {field: 'itemName', align: 'center', title: 'ERPID', minWidth: 160, width: 160},
{field: 'docType$', align: 'center', title: '绫诲瀷', minWidth: 160, width: 160},
{field: 'cstmrName', align: 'center', title: '璐т富', minWidth: 160, width: 160},
{align: 'center', title: '鏄庣粏', toolbar: '#tbLook', minWidth: 160, width: 160},
@@ -126,9 +126,12 @@
{type: 'numbers'},
{field: 'matnr', title: '鍟嗗搧缂栧彿', width: 160},
{field: 'maktx', title: '鍚嶇О', width: 160},
+ {field: 'standby3', title: '瀹㈡埛SKU'},
+ {field: 'boxType1', title: '璐т富'},
+ {field: 'boxType3', title: '閲囪喘鍗曞彿'},
// {field: 'batch', title: '鎵瑰彿'}
- {field: 'standby1', align: 'center',title: 'po', hide: false},
- {field: 'standby2', 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'},
--
Gitblit v1.9.1