From 2ebf9333d0a53949ff647444064a4c2b73c52fd3 Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期六, 07 二月 2026 10:29:30 +0800
Subject: [PATCH] 客户需求优化调整4

---
 fzzy-igdss-core/src/main/java/com/fzzy/igds/service/ExportService.java |   15 +++++++++++++++
 1 files changed, 15 insertions(+), 0 deletions(-)

diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/ExportService.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/ExportService.java
index 05887ef..0a6754e 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/ExportService.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/ExportService.java
@@ -214,6 +214,18 @@
             }
         }
 
+        //閫氱煡鍗曠紪鐮�
+        cell = row.getCell(cellNum++);
+        if(cell == null || cell.getCellType() == CellType.BLANK){
+            resultData.setNoticeId("");
+        }else {
+            cell.setCellType(CellType.STRING);
+            String noticeId = cell.getStringCellValue().trim();
+            if(StringUtils.isNotEmpty(noticeId)){
+                resultData.setNoticeId(noticeId);
+            }
+        }
+
         //瑁呭嵏浠撳簱
         cell = row.getCell(cellNum++);
         if(cell == null || cell.getCellType() == CellType.BLANK){
@@ -348,6 +360,9 @@
             }
         }
 
+        if(null != resultData.getFullWeight() && null != resultData.getEmptyWeight()){
+            resultData.setNetWeight(resultData.getFullWeight() - resultData.getEmptyWeight());
+        }
         return resultData;
     }
 

--
Gitblit v1.9.3