From cc30df1c2f48ec4e52654774e1b8ae7fc8421717 Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期二, 07 十月 2025 13:18:53 +0800
Subject: [PATCH] #和得服务器

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

diff --git a/src/main/webapp/static/js/wrkMast/wrkMast.js b/src/main/webapp/static/js/wrkMast/wrkMast.js
index fe33064..77aff6a 100644
--- a/src/main/webapp/static/js/wrkMast/wrkMast.js
+++ b/src/main/webapp/static/js/wrkMast/wrkMast.js
@@ -32,7 +32,18 @@
             ,{field: 'locNo$', align: 'center',title: '鐩爣搴撲綅'}
             ,{field: 'barcode', align: 'center',title: '鏉$爜'}
             ,{field: 'preHave', align: 'center',title: '鍏堝叆鍝�', hide: true}
-            ,{field: 'takeNone', align: 'center',title: '绌烘搷浣�', hide: true}
+            ,{field: 'takeNone', align: 'center', title: 'AGV閿佸畾',
+                templet: function(d){
+                    if(d.takeNone === "0"){
+                        return "鏈彇璐�";
+                    } else if(d.takeNone === "1"){
+                        return "宸插彇璐�";
+                    } else {
+                        return "";
+                    }
+                }
+            }
+
             // ,{field: 'picking', align: 'center',title: '鎷f枡', templet:function(row){
             //         var html = "<input value='picking' type='checkbox' lay-skin='primary' lay-filter='tableCheckbox' table-index='"+row.LAY_TABLE_INDEX+"'";
             //         if(row.picking === 'Y'){html += " checked ";}
@@ -549,6 +560,7 @@
                 ,{field: 'wrkNo', align: 'center',title: '宸ヤ綔鍙�'}
                 ,{field: 'ioTime$', align: 'center',title: '宸ヤ綔鏃堕棿'}
                 ,{field: 'matnr', align: 'center',title: '鐗╂枡'}
+                ,{field: 'sku', align: 'center',title: '宸ュ簭', hide: false}
                 ,{field: 'lgnum', align: 'center',title: '浠撳簱鍙�'}
                 ,{field: 'tbnum', align: 'center',title: '杞偍璇锋眰缂栧彿'}
                 ,{field: 'tbpos', align: 'center',title: '琛岄」鐩�'}
@@ -559,7 +571,7 @@
                 ,{field: 'altme', align: 'center',title: '鍗曚綅'}
                 ,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉$爜'}
                 ,{field: 'bname', align: 'center',title: '鐢ㄦ埛ID'}
-                ,{field: 'memo', align: 'center',title: '澶囨敞'}
+                ,{field: 'memo', align: 'center',title: '澶囨敞', hide: false}
 
                 ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:50}
             ]],

--
Gitblit v1.9.1