From f8f88d218a90f7264465cc575a350792354402a2 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期四, 11 七月 2024 12:42:22 +0800
Subject: [PATCH] #
---
zy-asrs-wms/src/main/webapp/static/js/common.js | 4 ++--
zy-asrs-common/src/main/java/com/zy/asrs/common/domain/entity/MatExcel.java | 2 ++
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/entity/MatExcel.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/entity/MatExcel.java
index 20700d6..65f076a 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/entity/MatExcel.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/entity/MatExcel.java
@@ -85,5 +85,7 @@
private String batch;
@ExcelProperty(index = 32, value = "瀛樿揣鏍哥畻")
private String inventoryAccount;
+ @ExcelProperty(index = 33, value = "瑙勬牸")
+ private String specs;
}
diff --git a/zy-asrs-wms/src/main/webapp/static/js/common.js b/zy-asrs-wms/src/main/webapp/static/js/common.js
index 954205b..f16f134 100644
--- a/zy-asrs-wms/src/main/webapp/static/js/common.js
+++ b/zy-asrs-wms/src/main/webapp/static/js/common.js
@@ -190,7 +190,7 @@
// ,{field: 'tagId$', align: 'center',title: '鎵�灞炲綊绫�'}
,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О', width: 200}
// ,{field: 'name', align: 'center',title: '鍒悕'}
- ,{field: 'specs', align: 'center',title: '閰嶇疆'}
+ ,{field: 'specs', align: 'center',title: '瑙勬牸'}
,{field: 'model', align: 'center',title: '浠ｇ爜', hide: false}
,{field: 'color', align: 'center',title: '棰滆壊', hide: true}
,{field: 'brand', align: 'center',title: '鍝佺墝', hide: true}
@@ -232,7 +232,7 @@
,{field: 'anfme', align: 'center',title: '鏁伴噺'}
,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉＄爜'}
,{field: 'fullPlt$', align: 'center',title: '鏄惁婊℃澘'}
- ,{field: 'specs', align: 'center',title: '閰嶇疆'}
+ ,{field: 'specs', align: 'center',title: '瑙勬牸'}
,{field: 'model', align: 'center',title: '浠ｇ爜', hide: false}
,{field: 'color', align: 'center',title: '棰滆壊', hide: true}
,{field: 'brand', align: 'center',title: '鍝佺墝', hide: true}
--
Gitblit v1.9.1