From f97c8c0c36f81028de156c861b73d73428a1f415 Mon Sep 17 00:00:00 2001
From: Junjie <DELL@qq.com>
Date: 星期三, 11 二月 2026 15:14:07 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/utils/MapExcelUtils.java | 24 +++++++++++++++++++++++-
1 files changed, 23 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/utils/MapExcelUtils.java b/src/main/java/com/zy/asrs/utils/MapExcelUtils.java
index cdca8ca..d61d64e 100644
--- a/src/main/java/com/zy/asrs/utils/MapExcelUtils.java
+++ b/src/main/java/com/zy/asrs/utils/MapExcelUtils.java
@@ -322,7 +322,9 @@
}
HashMap<String, Object> mapData = data.get(k - 2).get(l - 2);
- mapData.put("bgColor", "merge");
+ Object devp = map.get("nodeType");
+ mapData.put("nodeType", "merge");
+ mapData.put("mergeType", devp);
mapData.put("value", map.get("value"));
}
}
@@ -342,6 +344,7 @@
if (cell == null) {
HashMap<String, Object> map = new HashMap<>();
map.put("bgColor", "none");
+ map.put("nodeType", "none");
map.put("cellWidth", "");
map.put("cellHeight", "");
map.put("value", "");
@@ -354,6 +357,25 @@
String bgColor = getCellBackgroundColor(cell);
map.put("bgColor", bgColor);
+ if(bgColor.equals("RGB(0,176,80)")) {
+ //璐ф灦
+ map.put("nodeType", "shelf");
+ } else if (bgColor.equals("RGB(255,192,0)")) {
+ //鍫嗗灈鏈�
+ map.put("nodeType", "crn");
+ } else if (bgColor.equals("RGB(255,255,0)")) {
+ //鍙屽伐浣嶅爢鍨涙満
+ map.put("nodeType", "dualCrn");
+ } else if (bgColor.equals("RGB(0,112,192)")) {
+ //杈撻�佺嚎
+ map.put("nodeType", "devp");
+ } else if (bgColor.equals("RGB(0,176,240)")) {
+ //RGV
+ map.put("nodeType", "rgv");
+ }else {
+ //绌虹櫧鍖哄煙
+ map.put("nodeType", "none");
+ }
int columnIndex = cell.getColumnIndex();
int columnWidth = sheet.getColumnWidth(columnIndex);//鑾峰彇鍒楀
--
Gitblit v1.9.1