From ef755a24517a15e602b137820a3c60e19b288a9d Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期四, 23 四月 2026 14:16:27 +0800
Subject: [PATCH] 导出销售台账送货单
---
src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java b/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java
index fa3ec06..86dca57 100644
--- a/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java
+++ b/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java
@@ -292,6 +292,7 @@
Row row7 = sheet.createRow(7);
row7.createCell(0).setCellValue("璐х墿璇︾粏淇℃伅锛�");
+ // 琛ㄥご锛氬叡鍥涜仈 + 铏氱嚎
int tableStart = 8;
Row headerRow = sheet.createRow(tableStart);
String[] headers = {"搴忓彿", "鐗╂枡缂栧彿", "鍝佸悕/瑙勬牸", "鍗曚綅", "鏁伴噺", "璁㈠崟鍙�", "鍏卞洓鑱�"};
@@ -299,13 +300,12 @@
Cell hc = headerRow.createCell(i);
hc.setCellValue(headers[i]);
if (i == 6) {
- hc.setCellStyle(dashStyle);
+ hc.setCellStyle(dashStyle); // 鍏卞洓鑱� 鈫� 铏氱嚎
} else {
hc.setCellStyle(headerStyle);
}
}
- // 鏌ヨ鍟嗗搧
SalesLedgerProduct cond = new SalesLedgerProduct();
cond.setSalesLedgerId(ledger.getId());
List<SalesLedgerProduct> productList = salesLedgerProductServiceImpl.selectSalesLedgerProductList(cond);
@@ -324,7 +324,7 @@
SalesLedgerProduct p = i < productList.size() ? productList.get(i) : null;
Row dataRow = sheet.createRow(currentRow);
- // 鍓�6鍒�
+ // 鍓�6鍒楄祴鍊�
if (p != null) {
String materialCode = "";
if (p.getProductModelId() != null) {
@@ -350,11 +350,16 @@
dataRow.getCell(c).setCellStyle(dataCenterStyle);
}
- // 绗�7鍒楋細鍏卞洓鑱斿尯鍩�
+ // 鍏卞洓鑱斿垪
Cell fourCell = dataRow.createCell(6);
if (i < fourNames.length) {
fourCell.setCellValue(fourNames[i]);
- fourCell.setCellStyle(dashStyle);
+
+ if (i == 0 || i == 1 || i == 2) {
+ fourCell.setCellStyle(dashStyle);
+ } else {
+ fourCell.setCellStyle(noBorder);
+ }
} else {
fourCell.setCellStyle(noBorder);
}
@@ -392,7 +397,7 @@
} catch (Exception e) {
log.error("鎵归噺瀵煎嚭閫佽揣鍗曞紓甯�", e);
- throw new BaseException("鎵归噺瀵煎嚭澶辫触");
+ throw new BaseException("瀵煎嚭澶辫触");
}
}
--
Gitblit v1.9.3