From e7dd8b490661c994c414c0edc2da1854d9bcef82 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 05 十一月 2026 13:33:12 +0800
Subject: [PATCH] feat(excel): 优化Excel列宽与必填标记并支持巡检附件
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/metering/vo/MesDvMeteringImportExcelVO.java | 2
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/vo/customer/CrmCustomerImportExcelVO.java | 1
yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/enums/storage/StorageRecordTypeEnum.java | 1
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/route/vo/MesProRouteCompleteImportWorkbook.java | 19 ++++++
yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/controller/admin/item/vo/MdmItemImportExcelVO.java | 2
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/machinery/vo/MesDvMachineryImportExcelVO.java | 4 +
yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/vo/dept/DeptImportExcelVO.java | 3 +
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/attachment/MesQcAttachmentController.java | 13 ++-
yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/vo/post/PostImportExcelVO.java | 3 +
yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserImportExcelVO.java | 1
yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/controller/admin/unit/vo/MdmUnitMeasureImportExcelVO.java | 2
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/route/vo/MesProRouteImportExcelVO.java | 2
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contract/vo/contract/CrmContractImportExcelVO.java | 2
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialstock/vo/MesWmMaterialStockImportExcelVO.java | 4 +
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/employee/vo/HrmEmployeeImportExcelVO.java | 1
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/vo/HrmAttendanceRecordImportExcelVO.java | 2
yudao-framework/yudao-spring-boot-starter-excel/src/main/java/cn/iocoder/yudao/framework/excel/core/handler/ColumnWidthMatchStyleStrategy.java | 23 +++++++
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/route/MesProRouteController.java | 20 +++++-
yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/supplier/vo/SrmSupplierImportExcelVO.java | 2
yudao-framework/yudao-spring-boot-starter-excel/src/main/java/cn/iocoder/yudao/framework/excel/core/util/ExcelUtils.java | 8 +-
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/employee/vo/HrmEmployeeContractImportExcelVO.java | 4 +
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/item/vo/type/MesMdItemTypeImportExcelVO.java | 2
22 files changed, 107 insertions(+), 14 deletions(-)
diff --git a/yudao-framework/yudao-spring-boot-starter-excel/src/main/java/cn/iocoder/yudao/framework/excel/core/handler/ColumnWidthMatchStyleStrategy.java b/yudao-framework/yudao-spring-boot-starter-excel/src/main/java/cn/iocoder/yudao/framework/excel/core/handler/ColumnWidthMatchStyleStrategy.java
index 3ed512d..69100bf 100644
--- a/yudao-framework/yudao-spring-boot-starter-excel/src/main/java/cn/iocoder/yudao/framework/excel/core/handler/ColumnWidthMatchStyleStrategy.java
+++ b/yudao-framework/yudao-spring-boot-starter-excel/src/main/java/cn/iocoder/yudao/framework/excel/core/handler/ColumnWidthMatchStyleStrategy.java
@@ -59,10 +59,31 @@
}
}
+ /** 鎸� Excel 鍒楀浼拌琛ㄥご锛氫腑鏃ラ煩瀹藉瓧绗﹀崰涓ゆ牸锛屽苟涓鸿竟璺濈暀鍑虹┖闂淬�� */
+ private int headerWidth(String text) {
+ int widest = 0;
+ int line = 0;
+ for (int offset = 0; offset < text.length();) {
+ int cp = text.codePointAt(offset);
+ offset += Character.charCount(cp);
+ if (cp == '\n' || cp == '\r') {
+ widest = Math.max(widest, line);
+ line = 0;
+ continue;
+ }
+ Character.UnicodeScript script = Character.UnicodeScript.of(cp);
+ boolean wide = script == Character.UnicodeScript.HAN || script == Character.UnicodeScript.HIRAGANA
+ || script == Character.UnicodeScript.KATAKANA || script == Character.UnicodeScript.HANGUL
+ || (cp >= 0xff01 && cp <= 0xff60) || (cp >= 0xffe0 && cp <= 0xffe6);
+ line += wide ? 2 : 1;
+ }
+ return Math.max(widest, line);
+ }
+
@SuppressWarnings("EnhancedSwitchMigration")
private Integer dataLength(List<WriteCellData<?>> cellDataList, Cell cell, Boolean isHead) {
if (isHead) {
- return cell.getStringCellValue().getBytes().length;
+ return Math.max(12, headerWidth(cell.getStringCellValue()) + 3);
}
WriteCellData<?> cellData = cellDataList.get(0);
CellDataTypeEnum type = cellData.getType();
diff --git a/yudao-framework/yudao-spring-boot-starter-excel/src/main/java/cn/iocoder/yudao/framework/excel/core/util/ExcelUtils.java b/yudao-framework/yudao-spring-boot-starter-excel/src/main/java/cn/iocoder/yudao/framework/excel/core/util/ExcelUtils.java
index 5a9b24d..b2bd788 100644
--- a/yudao-framework/yudao-spring-boot-starter-excel/src/main/java/cn/iocoder/yudao/framework/excel/core/util/ExcelUtils.java
+++ b/yudao-framework/yudao-spring-boot-starter-excel/src/main/java/cn/iocoder/yudao/framework/excel/core/util/ExcelUtils.java
@@ -10,6 +10,7 @@
import cn.idev.excel.metadata.CellExtra;
import cn.iocoder.yudao.framework.common.util.http.HttpUtils;
import cn.iocoder.yudao.framework.excel.core.handler.ColumnWidthMatchStyleStrategy;
+import cn.iocoder.yudao.framework.excel.core.handler.RequiredHeaderWriteHandler;
import cn.iocoder.yudao.framework.excel.core.handler.SelectSheetWriteHandler;
import jakarta.servlet.http.HttpServletResponse;
import org.springframework.web.multipart.MultipartFile;
@@ -45,12 +46,13 @@
public static <T> void write(HttpServletResponse response, String filename, String sheetName,
Class<T> head, List<T> data) throws IOException {
// 杈撳嚭 Excel
- ExcelWriter excelWriter = FastExcelFactory.write(response.getOutputStream(), head)
+ var builder = FastExcelFactory.write(response.getOutputStream(), head)
.autoCloseStream(false) // 涓嶈鑷姩鍏抽棴锛屼氦缁� Servlet 鑷繁澶勭悊
.registerWriteHandler(new ColumnWidthMatchStyleStrategy()) // 鍩轰簬 column 闀垮害锛岃嚜鍔ㄩ�傞厤銆傛渶澶� 255 瀹藉害
.registerWriteHandler(new SelectSheetWriteHandler(head)) // 鍩轰簬鍥哄畾 sheet 瀹炵幇涓嬫媺妗�
- .registerConverter(new LongStringConverter()) // 閬垮厤 Long 绫诲瀷涓㈠け绮惧害
- .build();
+ .registerConverter(new LongStringConverter()); // 閬垮厤 Long 绫诲瀷涓㈠け绮惧害
+ if (filename.contains("妯℃澘")) builder.registerWriteHandler(new RequiredHeaderWriteHandler());
+ ExcelWriter excelWriter = builder.build();
try {
excelWriter.write(data, FastExcelFactory.writerSheet(sheetName).build());
} finally {
diff --git a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contract/vo/contract/CrmContractImportExcelVO.java b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contract/vo/contract/CrmContractImportExcelVO.java
index 982f016..eb12e93 100644
--- a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contract/vo/contract/CrmContractImportExcelVO.java
+++ b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contract/vo/contract/CrmContractImportExcelVO.java
@@ -32,10 +32,12 @@
@ExcelProperty("鍚堝悓鍚嶇О")
@Schema(description = "鍚堝悓鍚嶇О", requiredMode = Schema.RequiredMode.REQUIRED)
+ @cn.iocoder.yudao.framework.excel.core.handler.ExcelRequired
private String name;
@ExcelProperty("瀹㈡埛鍚嶇О")
@Schema(description = "瀹㈡埛鍚嶇О锛岄渶涓� CRM 瀹㈡埛鍚嶇О涓�鑷�", requiredMode = Schema.RequiredMode.REQUIRED)
+ @cn.iocoder.yudao.framework.excel.core.handler.ExcelRequired
private String customerName;
@ExcelProperty("涓嬪崟鏃堕棿")
diff --git a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/vo/customer/CrmCustomerImportExcelVO.java b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/vo/customer/CrmCustomerImportExcelVO.java
index 5cab35c..1de30aa 100644
--- a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/vo/customer/CrmCustomerImportExcelVO.java
+++ b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/vo/customer/CrmCustomerImportExcelVO.java
@@ -24,6 +24,7 @@
public class CrmCustomerImportExcelVO {
@ExcelProperty("瀹㈡埛鍚嶇О")
+ @cn.iocoder.yudao.framework.excel.core.handler.ExcelRequired
private String name;
@ExcelProperty("鎵嬫満")
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/vo/HrmAttendanceRecordImportExcelVO.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/vo/HrmAttendanceRecordImportExcelVO.java
index 44e4ee1..9fd9bc0 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/vo/HrmAttendanceRecordImportExcelVO.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/vo/HrmAttendanceRecordImportExcelVO.java
@@ -21,12 +21,14 @@
public class HrmAttendanceRecordImportExcelVO {
@ExcelProperty("鍛樺伐濮撳悕")
+ @cn.iocoder.yudao.framework.excel.core.handler.ExcelRequired
private String userName;
@ExcelProperty("鎵嬫満鍙�")
private String phone;
@ExcelProperty("鑰冨嫟鏃ユ湡")
+ @cn.iocoder.yudao.framework.excel.core.handler.ExcelRequired
private LocalDate date;
@ExcelProperty("涓婄彮鎵撳崱鏃堕棿")
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/employee/vo/HrmEmployeeContractImportExcelVO.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/employee/vo/HrmEmployeeContractImportExcelVO.java
index a81b4d9..e02ff67 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/employee/vo/HrmEmployeeContractImportExcelVO.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/employee/vo/HrmEmployeeContractImportExcelVO.java
@@ -21,14 +21,17 @@
public class HrmEmployeeContractImportExcelVO {
@ExcelProperty("鍛樺伐濮撳悕")
+ @cn.iocoder.yudao.framework.excel.core.handler.ExcelRequired
private String name;
@ExcelProperty(value = "鍚堝悓绫诲瀷", converter = DictConvert.class)
@DictFormat("hrm_contract_type")
+ @cn.iocoder.yudao.framework.excel.core.handler.ExcelRequired
private Integer contractType;
@ExcelProperty(value = "鍚堝悓鏈熼檺绫诲瀷", converter = DictConvert.class)
@DictFormat("hrm_contract_term_type")
+ @cn.iocoder.yudao.framework.excel.core.handler.ExcelRequired
private Integer contractTermType;
@ExcelProperty("绛剧害涓讳綋锛堝叕鍙稿叏绉帮級")
@@ -38,6 +41,7 @@
private LocalDate signDate;
@ExcelProperty("鍚堝悓寮�濮嬫棩鏈�")
+ @cn.iocoder.yudao.framework.excel.core.handler.ExcelRequired
private LocalDate startDate;
@ExcelProperty("鍚堝悓缁撴潫鏃ユ湡")
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/employee/vo/HrmEmployeeImportExcelVO.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/employee/vo/HrmEmployeeImportExcelVO.java
index 977f0c1..320309e 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/employee/vo/HrmEmployeeImportExcelVO.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/employee/vo/HrmEmployeeImportExcelVO.java
@@ -20,6 +20,7 @@
public class HrmEmployeeImportExcelVO {
@ExcelProperty("鍛樺伐濮撳悕")
+ @cn.iocoder.yudao.framework.excel.core.handler.ExcelRequired
private String name;
@ExcelProperty(value = "鎬у埆", converter = DictConvert.class)
diff --git a/yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/controller/admin/item/vo/MdmItemImportExcelVO.java b/yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/controller/admin/item/vo/MdmItemImportExcelVO.java
index 32c0543..4971915 100644
--- a/yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/controller/admin/item/vo/MdmItemImportExcelVO.java
+++ b/yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/controller/admin/item/vo/MdmItemImportExcelVO.java
@@ -17,9 +17,11 @@
@NoArgsConstructor
public class MdmItemImportExcelVO {
+ @cn.iocoder.yudao.framework.excel.core.handler.ExcelRequired
@ExcelProperty("浜у搧缂栧彿锛堜慨鏀规椂鐢ㄤ簬鍖归厤锛屾柊澧炴椂鑷姩鐢熸垚锛�")
private String code;
+ @cn.iocoder.yudao.framework.excel.core.handler.ExcelRequired
@ExcelProperty("鐗╂枡鍚嶇О")
private String name;
diff --git a/yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/controller/admin/unit/vo/MdmUnitMeasureImportExcelVO.java b/yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/controller/admin/unit/vo/MdmUnitMeasureImportExcelVO.java
index 6216134..09a5d71 100644
--- a/yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/controller/admin/unit/vo/MdmUnitMeasureImportExcelVO.java
+++ b/yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/controller/admin/unit/vo/MdmUnitMeasureImportExcelVO.java
@@ -21,9 +21,11 @@
public class MdmUnitMeasureImportExcelVO {
@ExcelProperty("鍗曚綅缂栫爜")
+ @cn.iocoder.yudao.framework.excel.core.handler.ExcelRequired
private String code;
@ExcelProperty("鍗曚綅鍚嶇О")
+ @cn.iocoder.yudao.framework.excel.core.handler.ExcelRequired
private String name;
@ExcelProperty("鏄惁涓诲崟浣�")
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/machinery/vo/MesDvMachineryImportExcelVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/machinery/vo/MesDvMachineryImportExcelVO.java
index fe5729d..ef4f08b 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/machinery/vo/MesDvMachineryImportExcelVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/machinery/vo/MesDvMachineryImportExcelVO.java
@@ -19,9 +19,11 @@
public class MesDvMachineryImportExcelVO {
@ExcelProperty("璁惧缂栫爜")
+ @cn.iocoder.yudao.framework.excel.core.handler.ExcelRequired
private String code;
@ExcelProperty("璁惧鍚嶇О")
+ @cn.iocoder.yudao.framework.excel.core.handler.ExcelRequired
private String name;
@ExcelProperty("鍝佺墝")
@@ -31,9 +33,11 @@
private String specification;
@ExcelProperty("璁惧绫诲瀷缂栫爜")
+ @cn.iocoder.yudao.framework.excel.core.handler.ExcelRequired
private String machineryTypeCode;
@ExcelProperty("鎵�灞炶溅闂寸紪鐮�")
+ @cn.iocoder.yudao.framework.excel.core.handler.ExcelRequired
private String workshopCode;
@ExcelProperty(value = "璁惧鐘舵��", converter = DictConvert.class)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/metering/vo/MesDvMeteringImportExcelVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/metering/vo/MesDvMeteringImportExcelVO.java
index 4b7e797..53cce44 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/metering/vo/MesDvMeteringImportExcelVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/metering/vo/MesDvMeteringImportExcelVO.java
@@ -26,10 +26,12 @@
@ExcelProperty("璁¢噺鍣ㄥ叿缂栫爜")
@Schema(description = "璁¢噺鍣ㄥ叿缂栫爜锛屽敮涓�", requiredMode = Schema.RequiredMode.REQUIRED)
+ @cn.iocoder.yudao.framework.excel.core.handler.ExcelRequired
private String code;
@ExcelProperty("璁¢噺鍣ㄥ叿鍚嶇О")
@Schema(description = "璁¢噺鍣ㄥ叿鍚嶇О", requiredMode = Schema.RequiredMode.REQUIRED)
+ @cn.iocoder.yudao.framework.excel.core.handler.ExcelRequired
private String name;
@ExcelProperty(value = "鍣ㄥ叿绫诲埆", converter = DictConvert.class)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/item/vo/type/MesMdItemTypeImportExcelVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/item/vo/type/MesMdItemTypeImportExcelVO.java
index a4c4ce2..2e133df 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/item/vo/type/MesMdItemTypeImportExcelVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/item/vo/type/MesMdItemTypeImportExcelVO.java
@@ -16,9 +16,11 @@
public class MesMdItemTypeImportExcelVO {
@ExcelProperty("鍒嗙被缂栫爜")
+ @cn.iocoder.yudao.framework.excel.core.handler.ExcelRequired
private String code;
@ExcelProperty("鍒嗙被鍚嶇О")
+ @cn.iocoder.yudao.framework.excel.core.handler.ExcelRequired
private String name;
@ExcelProperty("鐖跺垎绫荤紪鐮�")
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/route/MesProRouteController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/route/MesProRouteController.java
index 0c88a60..ac39079 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/route/MesProRouteController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/route/MesProRouteController.java
@@ -159,15 +159,25 @@
ExcelWriter writer = FastExcelFactory.write(response.getOutputStream()).autoCloseStream(false).build();
try {
writer.write(Collections.emptyList(), FastExcelFactory.writerSheet(0, "璺嚎")
- .head(MesProRouteCompleteImportWorkbook.RouteRow.class).build());
+ .head(MesProRouteCompleteImportWorkbook.RouteRow.class)
+ .registerWriteHandler(new cn.iocoder.yudao.framework.excel.core.handler.ColumnWidthMatchStyleStrategy())
+ .registerWriteHandler(new cn.iocoder.yudao.framework.excel.core.handler.RequiredHeaderWriteHandler()).build());
writer.write(Collections.emptyList(), FastExcelFactory.writerSheet(1, "浜у搧")
- .head(MesProRouteCompleteImportWorkbook.ProductRow.class).build());
+ .head(MesProRouteCompleteImportWorkbook.ProductRow.class)
+ .registerWriteHandler(new cn.iocoder.yudao.framework.excel.core.handler.ColumnWidthMatchStyleStrategy())
+ .registerWriteHandler(new cn.iocoder.yudao.framework.excel.core.handler.RequiredHeaderWriteHandler()).build());
writer.write(Collections.emptyList(), FastExcelFactory.writerSheet(2, "宸ュ簭")
- .head(MesProRouteCompleteImportWorkbook.ProcessRow.class).build());
+ .head(MesProRouteCompleteImportWorkbook.ProcessRow.class)
+ .registerWriteHandler(new cn.iocoder.yudao.framework.excel.core.handler.ColumnWidthMatchStyleStrategy())
+ .registerWriteHandler(new cn.iocoder.yudao.framework.excel.core.handler.RequiredHeaderWriteHandler()).build());
writer.write(Collections.emptyList(), FastExcelFactory.writerSheet(3, "宸ュ簭浜у嚭")
- .head(MesProRouteCompleteImportWorkbook.OutputRow.class).build());
+ .head(MesProRouteCompleteImportWorkbook.OutputRow.class)
+ .registerWriteHandler(new cn.iocoder.yudao.framework.excel.core.handler.ColumnWidthMatchStyleStrategy())
+ .registerWriteHandler(new cn.iocoder.yudao.framework.excel.core.handler.RequiredHeaderWriteHandler()).build());
writer.write(Collections.emptyList(), FastExcelFactory.writerSheet(4, "宸ュ簭鎶曟枡")
- .head(MesProRouteCompleteImportWorkbook.InputRow.class).build());
+ .head(MesProRouteCompleteImportWorkbook.InputRow.class)
+ .registerWriteHandler(new cn.iocoder.yudao.framework.excel.core.handler.ColumnWidthMatchStyleStrategy())
+ .registerWriteHandler(new cn.iocoder.yudao.framework.excel.core.handler.RequiredHeaderWriteHandler()).build());
writer.write(List.of(
new MesProRouteCompleteImportWorkbook.GuideRow("璺嚎", "姣忚涓�鏉¤矾绾匡紱璺嚎缂栫爜鍞竴銆傚畬鏁村鍏ヤ粎鏂板锛屽凡鏈夌紪鐮佷細鎶ラ敊锛屽鍏ュ悗榛樿鍋滅敤銆�"),
new MesProRouteCompleteImportWorkbook.GuideRow("浜у搧", "璺嚎缂栫爜涓庤矾绾胯〃涓�鑷达紱姣忔潯璺嚎鑷冲皯涓�涓骇鍝併�傜墿鏂欍�佷粨搴撱�佸簱鍖恒�佸簱浣嶅~鍐欏凡鏈変笟鍔$紪鐮侊紱鏃堕棿鍗曚綅濉� MINUTE/HOUR/DAY銆�"),
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/route/vo/MesProRouteCompleteImportWorkbook.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/route/vo/MesProRouteCompleteImportWorkbook.java
index 739a777..a592666 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/route/vo/MesProRouteCompleteImportWorkbook.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/route/vo/MesProRouteCompleteImportWorkbook.java
@@ -18,7 +18,9 @@
@Data
public static class RouteRow {
+ @cn.iocoder.yudao.framework.excel.core.handler.ExcelRequired
@ExcelProperty("璺嚎缂栫爜") private String routeCode;
+ @cn.iocoder.yudao.framework.excel.core.handler.ExcelRequired
@ExcelProperty("璺嚎鍚嶇О") private String name;
@ExcelProperty("璺嚎璇存槑") private String description;
@ExcelProperty("澶囨敞") private String remark;
@@ -26,10 +28,15 @@
@Data
public static class ProductRow {
+ @cn.iocoder.yudao.framework.excel.core.handler.ExcelRequired
@ExcelProperty("璺嚎缂栫爜") private String routeCode;
+ @cn.iocoder.yudao.framework.excel.core.handler.ExcelRequired
@ExcelProperty("浜у搧鐗╂枡缂栫爜") private String itemCode;
+ @cn.iocoder.yudao.framework.excel.core.handler.ExcelRequired
@ExcelProperty("浠撳簱缂栫爜") private String warehouseCode;
+ @cn.iocoder.yudao.framework.excel.core.handler.ExcelRequired
@ExcelProperty("搴撳尯缂栫爜") private String locationCode;
+ @cn.iocoder.yudao.framework.excel.core.handler.ExcelRequired
@ExcelProperty("搴撲綅缂栫爜") private String areaCode;
@ExcelProperty("鐢熶骇鏁伴噺") private Integer quantity;
@ExcelProperty("鐢熶骇鐢ㄦ椂") private BigDecimal productionTime;
@@ -39,8 +46,11 @@
@Data
public static class ProcessRow {
+ @cn.iocoder.yudao.framework.excel.core.handler.ExcelRequired
@ExcelProperty("璺嚎缂栫爜") private String routeCode;
+ @cn.iocoder.yudao.framework.excel.core.handler.ExcelRequired
@ExcelProperty("宸ュ簭缂栫爜") private String processCode;
+ @cn.iocoder.yudao.framework.excel.core.handler.ExcelRequired
@ExcelProperty("鎺掑簭") private Integer sort;
@ExcelProperty("宸ヨ壓鍙傛暟妯℃澘ID") private Long paramTemplateId;
@ExcelProperty("宸ュ簭鏀剁巼") private BigDecimal yieldRate;
@@ -56,8 +66,11 @@
@Data
public static class OutputRow {
+ @cn.iocoder.yudao.framework.excel.core.handler.ExcelRequired
@ExcelProperty("璺嚎缂栫爜") private String routeCode;
+ @cn.iocoder.yudao.framework.excel.core.handler.ExcelRequired
@ExcelProperty("宸ュ簭缂栫爜") private String processCode;
+ @cn.iocoder.yudao.framework.excel.core.handler.ExcelRequired
@ExcelProperty("浜у嚭鐗╂枡缂栫爜") private String itemCode;
@ExcelProperty("褰掑睘浜у搧缂栫爜(绌轰负閫氱敤)") private String productCode;
@ExcelProperty("鎺掑簭") private Integer sort;
@@ -66,9 +79,13 @@
@Data
public static class InputRow {
+ @cn.iocoder.yudao.framework.excel.core.handler.ExcelRequired
@ExcelProperty("璺嚎缂栫爜") private String routeCode;
+ @cn.iocoder.yudao.framework.excel.core.handler.ExcelRequired
@ExcelProperty("宸ュ簭缂栫爜") private String processCode;
+ @cn.iocoder.yudao.framework.excel.core.handler.ExcelRequired
@ExcelProperty("褰掑睘浜у搧缂栫爜") private String productCode;
+ @cn.iocoder.yudao.framework.excel.core.handler.ExcelRequired
@ExcelProperty("鎶曟枡鐗╂枡缂栫爜") private String itemCode;
@ExcelProperty("鐢ㄦ枡姣斾緥") private BigDecimal quantity;
@ExcelProperty("澶囨敞") private String remark;
@@ -76,7 +93,9 @@
@Data
public static class GuideRow {
+ @cn.idev.excel.annotation.write.style.ColumnWidth(16)
@ExcelProperty("宸ヤ綔琛�") private String sheet;
+ @cn.idev.excel.annotation.write.style.ColumnWidth(120)
@ExcelProperty("濉啓璇存槑") private String description;
public GuideRow(String sheet, String description) {
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/route/vo/MesProRouteImportExcelVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/route/vo/MesProRouteImportExcelVO.java
index 6543c9b..0b820ef 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/route/vo/MesProRouteImportExcelVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/route/vo/MesProRouteImportExcelVO.java
@@ -15,9 +15,11 @@
@NoArgsConstructor
public class MesProRouteImportExcelVO {
+ @cn.iocoder.yudao.framework.excel.core.handler.ExcelRequired
@ExcelProperty("宸ヨ壓璺嚎缂栫爜")
private String code;
+ @cn.iocoder.yudao.framework.excel.core.handler.ExcelRequired
@ExcelProperty("宸ヨ壓璺嚎鍚嶇О")
private String name;
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/attachment/MesQcAttachmentController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/attachment/MesQcAttachmentController.java
index 2489fd3..a00331b 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/attachment/MesQcAttachmentController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/attachment/MesQcAttachmentController.java
@@ -31,13 +31,14 @@
@Resource private MesQcIpqcService ipqcService;
@Resource private MesQcOqcService oqcService;
@Resource private MesQcRqcService rqcService;
+ @Resource private cn.iocoder.yudao.module.mes.controller.admin.qc.patrol.PatrolMapper patrolMapper;
@Resource private StorageAttachmentApi storageApi;
@Resource private org.springframework.jdbc.core.JdbcTemplate jdbcTemplate;
@GetMapping("/list")
@PreAuthorize("@ss.hasPermission('mes:qc-' + #type.toLowerCase() + ':query')")
public CommonResult<List<StorageBlobRespDTO>> list(
- @RequestParam @Pattern(regexp = "iqc|ipqc|oqc|rqc") String type,
+ @RequestParam @Pattern(regexp = "iqc|ipqc|oqc|rqc|patrol") String type,
@RequestParam @NotNull Long id) {
validateDocument(type, id);
var files = storageApi.listAttachments(recordType(type), id);
@@ -74,7 +75,7 @@
@PreAuthorize("@ss.hasPermission('mes:qc-' + #type.toLowerCase() + ':update')")
@Transactional(rollbackFor = Exception.class)
public CommonResult<Boolean> remove(
- @RequestParam @Pattern(regexp = "iqc|ipqc|oqc|rqc") String type,
+ @RequestParam @Pattern(regexp = "iqc|ipqc|oqc|rqc|patrol") String type,
@RequestParam @NotNull Long id, @RequestParam @NotNull Long blobId) {
lockDocument(type, id);
validateDocument(type, id);
@@ -84,7 +85,7 @@
private String recordType(String type) {
return switch (type) {
- case "iqc", "ipqc", "oqc", "rqc" -> "mes_qc_" + type + "_attachment";
+ case "iqc", "ipqc", "oqc", "rqc", "patrol" -> "mes_qc_" + type + "_attachment";
default -> throw new ServiceException(400, "璐ㄦ绫诲瀷鏃犳晥");
};
}
@@ -95,6 +96,7 @@
case "ipqc" -> "mes_qc_ipqc";
case "oqc" -> "mes_qc_oqc";
case "rqc" -> "mes_qc_rqc";
+ case "patrol" -> "mes_qc_patrol";
default -> throw new ServiceException(400, "璐ㄦ绫诲瀷鏃犳晥");
};
var ids = jdbcTemplate.queryForList("SELECT id FROM " + table + " WHERE id = ? AND deleted = 0 FOR UPDATE", Long.class, id);
@@ -107,17 +109,18 @@
case "ipqc" -> ipqcService.validateIpqcExists(id).getStatus();
case "oqc" -> oqcService.validateOqcExists(id).getStatus();
case "rqc" -> rqcService.validateRqcExists(id).getStatus();
+ case "patrol" -> { if (patrolMapper.selectById(id) == null) throw new ServiceException(400, "宸℃璁板綍涓嶅瓨鍦�"); yield 0; }
default -> throw new ServiceException(400, "璐ㄦ绫诲瀷鏃犳晥");
};
}
@Data public static class SaveReq {
- @NotNull @Pattern(regexp = "iqc|ipqc|oqc|rqc") private String type;
+ @NotNull @Pattern(regexp = "iqc|ipqc|oqc|rqc|patrol") private String type;
@NotNull private Long id;
@NotEmpty @Size(max = 50) private List<@NotNull Long> blobIds;
}
@Data public static class AppendReq {
- @NotNull @Pattern(regexp = "iqc|ipqc|oqc|rqc") private String type;
+ @NotNull @Pattern(regexp = "iqc|ipqc|oqc|rqc|patrol") private String type;
@NotNull private Long id;
@NotNull private Long blobId;
}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialstock/vo/MesWmMaterialStockImportExcelVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialstock/vo/MesWmMaterialStockImportExcelVO.java
index 624a359..a444e9f 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialstock/vo/MesWmMaterialStockImportExcelVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialstock/vo/MesWmMaterialStockImportExcelVO.java
@@ -18,9 +18,11 @@
public class MesWmMaterialStockImportExcelVO {
@ExcelProperty("鐗╂枡缂栫爜")
+ @cn.iocoder.yudao.framework.excel.core.handler.ExcelRequired
private String itemCode;
@ExcelProperty("浠撳簱")
+ @cn.iocoder.yudao.framework.excel.core.handler.ExcelRequired
private String warehouse;
@ExcelProperty("搴撳尯")
@@ -36,9 +38,11 @@
private String vendor;
@ExcelProperty("鎿嶄綔绫诲瀷")
+ @cn.iocoder.yudao.framework.excel.core.handler.ExcelRequired
private String operationType;
@ExcelProperty("鍦ㄥ簱鏁伴噺")
+ @cn.iocoder.yudao.framework.excel.core.handler.ExcelRequired
private BigDecimal quantity;
}
\ No newline at end of file
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/supplier/vo/SrmSupplierImportExcelVO.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/supplier/vo/SrmSupplierImportExcelVO.java
index 3ed98fc..13b00e9 100644
--- a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/supplier/vo/SrmSupplierImportExcelVO.java
+++ b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/supplier/vo/SrmSupplierImportExcelVO.java
@@ -15,9 +15,11 @@
public class SrmSupplierImportExcelVO {
@ExcelProperty("渚涘簲鍟嗙紪鐮�")
+ @cn.iocoder.yudao.framework.excel.core.handler.ExcelRequired
private String code;
@ExcelProperty("渚涘簲鍟嗗悕绉�")
+ @cn.iocoder.yudao.framework.excel.core.handler.ExcelRequired
private String name;
@ExcelProperty("渚涘簲鍟嗙畝绉�")
diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/vo/dept/DeptImportExcelVO.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/vo/dept/DeptImportExcelVO.java
index 86b3435..570655d 100644
--- a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/vo/dept/DeptImportExcelVO.java
+++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/vo/dept/DeptImportExcelVO.java
@@ -16,12 +16,14 @@
public class DeptImportExcelVO {
@ExcelProperty("閮ㄩ棬鍚嶇О")
+ @cn.iocoder.yudao.framework.excel.core.handler.ExcelRequired
private String name;
@ExcelProperty("涓婄骇閮ㄩ棬鍏ㄨ矾寰�")
private String parentPath;
@ExcelProperty("鏄剧ず椤哄簭")
+ @cn.iocoder.yudao.framework.excel.core.handler.ExcelRequired
private Integer sort;
@ExcelProperty("鑱旂郴鐢佃瘽")
@@ -32,6 +34,7 @@
@ExcelProperty(value = "鐘舵��", converter = DictConvert.class)
@DictFormat(DictTypeConstants.COMMON_STATUS)
+ @cn.iocoder.yudao.framework.excel.core.handler.ExcelRequired
private Integer status;
}
diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/vo/post/PostImportExcelVO.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/vo/post/PostImportExcelVO.java
index 24a2c64..94c8b0a 100644
--- a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/vo/post/PostImportExcelVO.java
+++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/vo/post/PostImportExcelVO.java
@@ -16,12 +16,15 @@
public class PostImportExcelVO {
@ExcelProperty("宀椾綅鍚嶇О")
+ @cn.iocoder.yudao.framework.excel.core.handler.ExcelRequired
private String name;
@ExcelProperty("宀椾綅缂栫爜")
+ @cn.iocoder.yudao.framework.excel.core.handler.ExcelRequired
private String code;
@ExcelProperty("宀椾綅鎺掑簭")
+ @cn.iocoder.yudao.framework.excel.core.handler.ExcelRequired
private Integer sort;
@ExcelProperty(value = "鐘舵��", converter = DictConvert.class)
diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserImportExcelVO.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserImportExcelVO.java
index f6400e1..fef345f 100644
--- a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserImportExcelVO.java
+++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserImportExcelVO.java
@@ -19,6 +19,7 @@
public class UserImportExcelVO {
@ExcelProperty("鐧诲綍鍚嶇О")
+ @cn.iocoder.yudao.framework.excel.core.handler.ExcelRequired
private String username;
@ExcelProperty("鐢ㄦ埛鍚嶇О")
diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/enums/storage/StorageRecordTypeEnum.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/enums/storage/StorageRecordTypeEnum.java
index 05a6a4a..899392b 100644
--- a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/enums/storage/StorageRecordTypeEnum.java
+++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/enums/storage/StorageRecordTypeEnum.java
@@ -71,6 +71,7 @@
MES_QC_IQC_ATTACHMENT("mes_qc_iqc_attachment", "鏉ユ枡璐ㄦ闄勪欢"),
MES_QC_IPQC_ATTACHMENT("mes_qc_ipqc_attachment", "杩囩▼璐ㄦ闄勪欢"),
MES_QC_OQC_ATTACHMENT("mes_qc_oqc_attachment", "鍑鸿揣璐ㄦ闄勪欢"),
+ MES_QC_PATROL_ATTACHMENT("mes_qc_patrol_attachment", "璐ㄩ噺宸℃闄勪欢"),
MES_QC_RQC_ATTACHMENT("mes_qc_rqc_attachment", "閫�璐ц川妫�闄勪欢"),
// ===== SRM =====
--
Gitblit v1.9.3