From ea62a3548fdc6f451cd464120fc98f1c3cca6f0d Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期五, 07 十一月 2025 16:53:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jshdasrs' into jshdasrs

---
 src/main/webapp/static/js/wrkMast/wrkMast.js |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/webapp/static/js/wrkMast/wrkMast.js b/src/main/webapp/static/js/wrkMast/wrkMast.js
index 7fb5529..8ea8c4a 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: '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