From 17ce55a3b038ed61d332bb54916de4fa55ba19c6 Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期二, 27 十月 2026 09:10:23 +0800
Subject: [PATCH] fix: 修复导出表头缺失、权限码不一致及生产链路断点
---
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/HrmAttendanceSummaryController.java | 2
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/HrmAttendanceHolidayController.java | 2
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/employee/HrmEmployeeServiceImpl.java | 34 +++++
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/HrmAttendanceRecordController.java | 2
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnvendor/vo/MesWmReturnVendorRespVO.java | 18 +++
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/approval/vo/HrmLeaveApplicationRespVO.java | 18 +++
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/employee/vo/HrmEmployeeImportExcelVO.java | 3
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/mps/MesProMpsServiceImpl.java | 2
yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/api/user/AdminUserApiImpl.java | 5
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productissue/vo/MesWmProductIssueRespVO.java | 16 ++
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnsales/vo/MesWmReturnSalesRespVO.java | 12 ++
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/HrmSalaryCalculationController.java | 2
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/miscissue/vo/MesWmMiscIssueRespVO.java | 15 ++
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/contract/CrmContractServiceImpl.java | 4
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/HrmAttendanceRuleController.java | 2
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/approval/vo/HrmResignationApplicationRespVO.java | 19 +++
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/miscreceipt/vo/MesWmMiscReceiptRespVO.java | 15 ++
yudao-module-hrm-api/src/main/java/cn/iocoder/yudao/module/hrm/enums/ErrorCodeConstants.java | 2
yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserImportExcelVO.java | 3
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/employee/vo/HrmEmployeeSaveReqVO.java | 3
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/approval/vo/HrmTransferApplicationRespVO.java | 18 +++
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/transfer/vo/MesWmTransferRespVO.java | 16 ++
yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/supplier/vo/SrmSupplierRespVO.java | 22 +++
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pro/mps/MesProMpsMapper.java | 13 ++
yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImpl.java | 23 ++-
yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/api/user/AdminUserApi.java | 8 +
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/task/vo/MesProTaskRespVO.java | 35 +++++
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnissue/vo/MesWmReturnIssueRespVO.java | 14 ++
yudao-module-erp-api/src/main/java/cn/iocoder/yudao/module/erp/api/sale/dto/ErpSaleOrderCreateReqDTO.java | 3
29 files changed, 317 insertions(+), 14 deletions(-)
diff --git a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/contract/CrmContractServiceImpl.java b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/contract/CrmContractServiceImpl.java
index 1a4568b..77d52cc 100644
--- a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/contract/CrmContractServiceImpl.java
+++ b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/contract/CrmContractServiceImpl.java
@@ -579,6 +579,10 @@
item.setProductId(cp.getItemId());
item.setProductPrice(cp.getContractPrice());
item.setCount(cp.getCount());
+ // 鍚堝悓浜у搧榛樿闇�瑕佺敓浜э細璁㈠崟瀹℃壒閫氳繃鍚庢墠鑳借嚜鍔ㄥ垱寤� MPS锛�
+ // 鍚﹀垯銆屽悎鍚� 鈫� 璁㈠崟 鈫� 鐢熶骇銆嶉摼璺湪鍚堝悓鏉ユ簮鐨勮鍗曚笂浼氭柇鎺夈��
+ // 鑻ヤ釜鍒骇鍝佷负澶栬喘/杞敭锛屽彲鍦ㄩ攢鍞鍗曟槑缁嗕腑鎶娿�岄渶瑕佺敓浜с�嶆敼涓哄惁銆�
+ item.setNeedProduction(1);
return item;
})
.toList();
diff --git a/yudao-module-erp-api/src/main/java/cn/iocoder/yudao/module/erp/api/sale/dto/ErpSaleOrderCreateReqDTO.java b/yudao-module-erp-api/src/main/java/cn/iocoder/yudao/module/erp/api/sale/dto/ErpSaleOrderCreateReqDTO.java
index 14042b8..18664cd 100644
--- a/yudao-module-erp-api/src/main/java/cn/iocoder/yudao/module/erp/api/sale/dto/ErpSaleOrderCreateReqDTO.java
+++ b/yudao-module-erp-api/src/main/java/cn/iocoder/yudao/module/erp/api/sale/dto/ErpSaleOrderCreateReqDTO.java
@@ -58,6 +58,9 @@
@Schema(description = "绋庣巼锛岀櫨鍒嗘瘮", example = "10")
private BigDecimal taxPercent;
+ @Schema(description = "鏄惁闇�瑕佺敓浜э細1-鏄� 0-鍚�", example = "1")
+ private Integer needProduction;
+
@Schema(description = "澶囨敞", example = "澶囨敞")
private String remark;
}
diff --git a/yudao-module-hrm-api/src/main/java/cn/iocoder/yudao/module/hrm/enums/ErrorCodeConstants.java b/yudao-module-hrm-api/src/main/java/cn/iocoder/yudao/module/hrm/enums/ErrorCodeConstants.java
index 2cd90df..2c91aa6 100644
--- a/yudao-module-hrm-api/src/main/java/cn/iocoder/yudao/module/hrm/enums/ErrorCodeConstants.java
+++ b/yudao-module-hrm-api/src/main/java/cn/iocoder/yudao/module/hrm/enums/ErrorCodeConstants.java
@@ -31,6 +31,8 @@
ErrorCode CERTIFICATE_IMPORT_LIST_IS_EMPTY = new ErrorCode(1_030_000_018, "瀵煎叆璇佷功璧勮川鏁版嵁涓嶈兘涓虹┖");
ErrorCode CERTIFICATE_EXISTS = new ErrorCode(1_030_000_019, "宸插瓨鍦ㄨ瘉涔﹁祫璐ㄣ�恵}銆戯紝涓旀湭寮�鍚鐩栵紒");
ErrorCode CERTIFICATE_EMPLOYEE_NOT_EXISTS = new ErrorCode(1_030_000_020, "鍛樺伐銆恵}銆戜笉瀛樺湪");
+ ErrorCode EMPLOYEE_INIT_PASSWORD_NOT_CONFIGURED = new ErrorCode(1_030_000_021,
+ "鏈~鍐欏垵濮嬪瘑鐮侊紝涓旂郴缁熷弬鏁� system.user.init-password 鏈厤缃�傝鍦ㄥ鍏ユ枃浠朵腑濉啓璇ヨ鍒濆瀵嗙爜锛屾垨鍏堝湪鍙傛暟璁剧疆涓厤缃� system.user.init-password");
// ========== 璇峰亣鐢宠 1-030-001-000 ==========
ErrorCode LEAVE_APPLICATION_NOT_EXISTS = new ErrorCode(1_030_001_000, "璇峰亣鐢宠涓嶅瓨鍦�");
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/approval/vo/HrmLeaveApplicationRespVO.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/approval/vo/HrmLeaveApplicationRespVO.java
index ed7c3a7..ab24454 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/approval/vo/HrmLeaveApplicationRespVO.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/approval/vo/HrmLeaveApplicationRespVO.java
@@ -1,5 +1,7 @@
package cn.iocoder.yudao.module.hrm.controller.admin.approval.vo;
+import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
+import cn.idev.excel.annotation.ExcelProperty;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
@@ -10,72 +12,88 @@
@Schema(description = "绠$悊鍚庡彴 - 璇峰亣鐢宠 Response VO")
@Data
+@ExcelIgnoreUnannotated
public class HrmLeaveApplicationRespVO {
@Schema(description = "鐢宠ID", example = "1")
private Long id;
@Schema(description = "鐢宠鍗曞彿", example = "LA202401001")
+ @ExcelProperty("鐢宠鍗曞彿")
private String no;
@Schema(description = "鐢宠浜篒D", example = "1")
private Long userId;
@Schema(description = "鐢宠浜哄鍚�", example = "寮犱笁")
+ @ExcelProperty("鐢宠浜�")
private String userName;
@Schema(description = "閮ㄩ棬ID", example = "1")
private Long deptId;
@Schema(description = "閮ㄩ棬鍚嶇О", example = "鐮斿彂閮�")
+ @ExcelProperty("閮ㄩ棬")
private String deptName;
@Schema(description = "璇峰亣绫诲瀷", example = "1")
private Integer leaveType;
@Schema(description = "璇峰亣绫诲瀷鍚嶇О", example = "骞村亣")
+ @ExcelProperty("璇峰亣绫诲瀷")
private String leaveTypeName;
@Schema(description = "寮�濮嬫椂闂�", example = "2024-01-01 09:00:00")
+ @ExcelProperty("寮�濮嬫椂闂�")
private LocalDateTime startTime;
@Schema(description = "缁撴潫鏃堕棿", example = "2024-01-02 18:00:00")
+ @ExcelProperty("缁撴潫鏃堕棿")
private LocalDateTime endTime;
@Schema(description = "璇峰亣鏃堕暱锛堝ぉ锛�", example = "1.5")
+ @ExcelProperty("璇峰亣鏃堕暱(澶�)")
private BigDecimal duration;
@Schema(description = "璇峰亣鍘熷洜", example = "涓汉浜嬪姟")
+ @ExcelProperty("璇峰亣浜嬬敱")
private String reason;
@Schema(description = "瀹℃壒鐘舵��", example = "0")
private Integer status;
@Schema(description = "瀹℃壒鐘舵�佸悕绉�", example = "鑽夌")
+ @ExcelProperty("鐘舵��")
private String statusName;
@Schema(description = "瀹℃牳浜虹敤鎴风紪鍙�", example = "1")
private Long reviewerId;
@Schema(description = "瀹℃牳浜哄鍚�", example = "寮犱笁")
+ @ExcelProperty("瀹℃牳浜�")
private String reviewerName;
@Schema(description = "瀹℃牳鏃堕棿", example = "2024-01-01 10:00:00")
+ @ExcelProperty("瀹℃牳鏃堕棿")
private LocalDateTime reviewTime;
@Schema(description = "瀹℃牳鎰忚锛堝鏍搁�氳繃鏃剁殑鎰忚 / 瀹℃牳涓嶉�氳繃鏃剁殑鍘熷洜锛�", example = "鍚屾剰")
+ @ExcelProperty("瀹℃牳鎰忚")
private String reviewRemark;
@Schema(description = "瀹℃壒瀹屾垚鏃堕棿", example = "2024-01-01 10:00:00")
+ @ExcelProperty("瀹℃壒閫氳繃鏃堕棿")
private LocalDateTime approveTime;
@Schema(description = "闄勪欢鍒楄〃")
private List<StorageBlobRespDTO> attachmentList;
@Schema(description = "澶囨敞", example = "澶囨敞淇℃伅")
+ @ExcelProperty("澶囨敞")
private String remark;
@Schema(description = "鍒涘缓鏃堕棿", example = "2024-01-01 09:00:00")
+ @ExcelProperty("鍒涘缓鏃堕棿")
private LocalDateTime createTime;
}
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/approval/vo/HrmResignationApplicationRespVO.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/approval/vo/HrmResignationApplicationRespVO.java
index 27f5778..371b63c 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/approval/vo/HrmResignationApplicationRespVO.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/approval/vo/HrmResignationApplicationRespVO.java
@@ -1,5 +1,7 @@
package cn.iocoder.yudao.module.hrm.controller.admin.approval.vo;
+import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
+import cn.idev.excel.annotation.ExcelProperty;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
@@ -10,81 +12,98 @@
@Schema(description = "绠$悊鍚庡彴 - 绂昏亴鐢宠 Response VO")
@Data
+@ExcelIgnoreUnannotated
public class HrmResignationApplicationRespVO {
@Schema(description = "鐢宠ID", example = "1")
private Long id;
@Schema(description = "鐢宠鍗曞彿", example = "RA202401001")
+ @ExcelProperty("鐢宠鍗曞彿")
private String no;
@Schema(description = "鐢宠浜篒D", example = "1")
private Long userId;
@Schema(description = "鐢宠浜哄鍚�", example = "寮犱笁")
+ @ExcelProperty("鐢宠浜�")
private String userName;
@Schema(description = "閮ㄩ棬ID", example = "1")
private Long deptId;
@Schema(description = "閮ㄩ棬鍚嶇О", example = "鐮斿彂閮�")
+ @ExcelProperty("閮ㄩ棬")
private String deptName;
@Schema(description = "绂昏亴绫诲瀷", example = "1")
private Integer resignationType;
@Schema(description = "绂昏亴绫诲瀷鍚嶇О", example = "涓诲姩绂昏亴")
+ @ExcelProperty("绂昏亴绫诲瀷")
private String resignationTypeName;
@Schema(description = "棰勮绂昏亴鏃ユ湡", example = "2024-02-01")
+ @ExcelProperty("鏈熸湜绂昏亴鏃ユ湡")
private LocalDate expectedDate;
@Schema(description = "瀹為檯绂昏亴鏃ユ湡", example = "2024-02-01")
+ @ExcelProperty("瀹為檯绂昏亴鏃ユ湡")
private LocalDate actualDate;
@Schema(description = "绂昏亴鍘熷洜", example = "涓汉鍙戝睍")
+ @ExcelProperty("绂昏亴鍘熷洜")
private String reason;
@Schema(description = "浜ゆ帴浜篒D", example = "1")
private Long handoverUserId;
@Schema(description = "浜ゆ帴浜哄鍚�", example = "鏉庡洓")
+ @ExcelProperty("浜ゆ帴浜�")
private String handoverUserName;
@Schema(description = "浜ゆ帴鐘舵��", example = "0")
private Integer handoverStatus;
@Schema(description = "浜ゆ帴鐘舵�佸悕绉�", example = "鏈紑濮�")
+ @ExcelProperty("浜ゆ帴鐘舵��")
private String handoverStatusName;
@Schema(description = "浜ゆ帴璇存槑", example = "浜ゆ帴璇存槑")
+ @ExcelProperty("浜ゆ帴璇存槑")
private String handoverRemark;
@Schema(description = "瀹℃壒鐘舵��", example = "0")
private Integer status;
@Schema(description = "瀹℃壒鐘舵�佸悕绉�", example = "鑽夌")
+ @ExcelProperty("鐘舵��")
private String statusName;
@Schema(description = "瀹℃牳浜虹敤鎴风紪鍙�", example = "1")
private Long reviewerId;
@Schema(description = "瀹℃牳浜哄鍚�", example = "寮犱笁")
+ @ExcelProperty("瀹℃牳浜�")
private String reviewerName;
@Schema(description = "瀹℃牳鏃堕棿", example = "2024-01-01 10:00:00")
+ @ExcelProperty("瀹℃牳鏃堕棿")
private LocalDateTime reviewTime;
@Schema(description = "瀹℃牳鎰忚锛堝鏍搁�氳繃鏃剁殑鎰忚 / 瀹℃牳涓嶉�氳繃鏃剁殑鍘熷洜锛�", example = "鍚屾剰")
+ @ExcelProperty("瀹℃牳鎰忚")
private String reviewRemark;
@Schema(description = "瀹℃壒瀹屾垚鏃堕棿", example = "2024-01-01 10:00:00")
+ @ExcelProperty("瀹℃壒閫氳繃鏃堕棿")
private LocalDateTime approveTime;
@Schema(description = "闄勪欢鍒楄〃")
private List<StorageBlobRespDTO> attachmentList;
@Schema(description = "澶囨敞", example = "澶囨敞淇℃伅")
+ @ExcelProperty("澶囨敞")
private String remark;
@Schema(description = "鍒涘缓鏃堕棿", example = "2024-01-01 09:00:00")
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/approval/vo/HrmTransferApplicationRespVO.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/approval/vo/HrmTransferApplicationRespVO.java
index beb66f5..ee2f9fe 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/approval/vo/HrmTransferApplicationRespVO.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/approval/vo/HrmTransferApplicationRespVO.java
@@ -1,5 +1,7 @@
package cn.iocoder.yudao.module.hrm.controller.admin.approval.vo;
+import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
+import cn.idev.excel.annotation.ExcelProperty;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
@@ -10,81 +12,97 @@
@Schema(description = "绠$悊鍚庡彴 - 璋冨矖鐢宠 Response VO")
@Data
+@ExcelIgnoreUnannotated
public class HrmTransferApplicationRespVO {
@Schema(description = "鐢宠ID", example = "1")
private Long id;
@Schema(description = "鐢宠鍗曞彿", example = "TA202401001")
+ @ExcelProperty("鐢宠鍗曞彿")
private String no;
@Schema(description = "鐢宠浜篒D", example = "1")
private Long userId;
@Schema(description = "鐢宠浜哄鍚�", example = "寮犱笁")
+ @ExcelProperty("鐢宠浜�")
private String userName;
@Schema(description = "鍘熼儴闂↖D", example = "1")
private Long currentDeptId;
@Schema(description = "鍘熼儴闂ㄥ悕绉�", example = "鐮斿彂閮�")
+ @ExcelProperty("鍘熼儴闂�")
private String currentDeptName;
@Schema(description = "鍘熷矖浣岻D", example = "1")
private Long currentPostId;
@Schema(description = "鍘熷矖浣嶅悕绉�", example = "Java寮�鍙戝伐绋嬪笀")
+ @ExcelProperty("鍘熷矖浣�")
private String currentPostName;
@Schema(description = "鐩爣閮ㄩ棬ID", example = "2")
private Long targetDeptId;
@Schema(description = "鐩爣閮ㄩ棬鍚嶇О", example = "浜у搧閮�")
+ @ExcelProperty("鐩爣閮ㄩ棬")
private String targetDeptName;
@Schema(description = "鐩爣宀椾綅ID", example = "2")
private Long targetPostId;
@Schema(description = "鐩爣宀椾綅鍚嶇О", example = "浜у搧缁忕悊")
+ @ExcelProperty("鐩爣宀椾綅")
private String targetPostName;
@Schema(description = "璋冨矖绫诲瀷", example = "1")
private Integer transferType;
@Schema(description = "璋冨矖绫诲瀷鍚嶇О", example = "骞宠皟")
+ @ExcelProperty("璋冨姩绫诲瀷")
private String transferTypeName;
@Schema(description = "鐢熸晥鏃ユ湡", example = "2024-02-01")
+ @ExcelProperty("鐢熸晥鏃ユ湡")
private LocalDate effectiveDate;
@Schema(description = "璋冨矖鍘熷洜", example = "涓氬姟闇�瑕�")
+ @ExcelProperty("璋冨姩鍘熷洜")
private String reason;
@Schema(description = "瀹℃壒鐘舵��", example = "0")
private Integer status;
@Schema(description = "瀹℃壒鐘舵�佸悕绉�", example = "鑽夌")
+ @ExcelProperty("鐘舵��")
private String statusName;
@Schema(description = "瀹℃牳浜虹敤鎴风紪鍙�", example = "1")
private Long reviewerId;
@Schema(description = "瀹℃牳浜哄鍚�", example = "鏉庡洓")
+ @ExcelProperty("瀹℃牳浜�")
private String reviewerName;
@Schema(description = "瀹℃牳鏃堕棿", example = "2024-01-01 10:00:00")
+ @ExcelProperty("瀹℃牳鏃堕棿")
private LocalDateTime reviewTime;
@Schema(description = "瀹℃牳鎰忚锛堝鏍搁�氳繃鏃剁殑鎰忚 / 瀹℃牳涓嶉�氳繃鏃剁殑鍘熷洜锛�", example = "鍚屾剰璋冨矖")
+ @ExcelProperty("瀹℃牳鎰忚")
private String reviewRemark;
@Schema(description = "瀹℃壒瀹屾垚鏃堕棿", example = "2024-01-01 10:00:00")
+ @ExcelProperty("瀹℃壒閫氳繃鏃堕棿")
private LocalDateTime approveTime;
@Schema(description = "闄勪欢鍒楄〃")
private List<StorageBlobRespDTO> attachmentList;
@Schema(description = "澶囨敞", example = "澶囨敞淇℃伅")
+ @ExcelProperty("澶囨敞")
private String remark;
@Schema(description = "鍒涘缓鏃堕棿", example = "2024-01-01 09:00:00")
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/HrmAttendanceHolidayController.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/HrmAttendanceHolidayController.java
index 913a2b4..83cce65 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/HrmAttendanceHolidayController.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/HrmAttendanceHolidayController.java
@@ -84,7 +84,7 @@
@GetMapping("/export-excel")
@Operation(summary = "瀵煎嚭鑺傚亣鏃ラ厤缃� Excel")
- @PreAuthorize("@ss.hasPermission('hrm:attendance:export')")
+ @PreAuthorize("@ss.hasAnyPermissions('hrm:attendance:export', 'hrm:attendance-holiday:export')")
@ApiAccessLog(operateType = EXPORT)
public void exportAttendanceHolidayExcel(@Valid HrmAttendanceHolidayPageReqVO pageReqVO,
HttpServletResponse response) throws IOException {
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/HrmAttendanceRecordController.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/HrmAttendanceRecordController.java
index 66e338e..e32aaf0 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/HrmAttendanceRecordController.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/HrmAttendanceRecordController.java
@@ -315,7 +315,7 @@
@GetMapping("/export-excel")
@Operation(summary = "瀵煎嚭鑰冨嫟璁板綍 Excel")
- @PreAuthorize("@ss.hasPermission('hrm:attendance:export')")
+ @PreAuthorize("@ss.hasAnyPermissions('hrm:attendance:export', 'hrm:attendance-record:export')")
@ApiAccessLog(operateType = EXPORT)
public void exportAttendanceRecordExcel(@Valid HrmAttendanceRecordPageReqVO pageReqVO,
HttpServletResponse response) throws IOException {
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/HrmAttendanceRuleController.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/HrmAttendanceRuleController.java
index 9d534e8..4b08932 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/HrmAttendanceRuleController.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/HrmAttendanceRuleController.java
@@ -124,7 +124,7 @@
@GetMapping("/export-excel")
@Operation(summary = "瀵煎嚭鑰冨嫟瑙勫垯 Excel")
- @PreAuthorize("@ss.hasPermission('hrm:attendance:export')")
+ @PreAuthorize("@ss.hasAnyPermissions('hrm:attendance:export', 'hrm:attendance-rule:export')")
@ApiAccessLog(operateType = EXPORT)
public void exportAttendanceRuleExcel(@Valid HrmAttendanceRulePageReqVO pageReqVO,
HttpServletResponse response) throws IOException {
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/HrmAttendanceSummaryController.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/HrmAttendanceSummaryController.java
index a684c8a..60fab9c 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/HrmAttendanceSummaryController.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/HrmAttendanceSummaryController.java
@@ -138,7 +138,7 @@
@GetMapping("/export-excel")
@Operation(summary = "瀵煎嚭鑰冨嫟缁熻姹囨�� Excel")
- @PreAuthorize("@ss.hasPermission('hrm:attendance:export')")
+ @PreAuthorize("@ss.hasAnyPermissions('hrm:attendance:export', 'hrm:attendance-summary:export')")
@ApiAccessLog(operateType = EXPORT)
public void exportAttendanceSummaryExcel(@Valid HrmAttendanceSummaryPageReqVO pageReqVO,
HttpServletResponse response) throws IOException {
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..3e0d721 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
@@ -29,6 +29,9 @@
@ExcelProperty("鎵嬫満鍙�")
private String phone;
+ @ExcelProperty("鍒濆瀵嗙爜")
+ private String password;
+
@ExcelProperty("閮ㄩ棬鍚嶇О")
private String deptName;
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/employee/vo/HrmEmployeeSaveReqVO.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/employee/vo/HrmEmployeeSaveReqVO.java
index fbe9c3d..750563e 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/employee/vo/HrmEmployeeSaveReqVO.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/employee/vo/HrmEmployeeSaveReqVO.java
@@ -49,6 +49,9 @@
@Pattern(regexp = "^1[3-9]\\d{9}$", message = "鎵嬫満鍙风爜鏍煎紡涓嶆纭�")
private String phone;
+ @Schema(description = "鍒濆瀵嗙爜锛堜负绌烘椂璇诲彇绯荤粺鍙傛暟 system.user.init-password锛�", example = "123456")
+ private String password;
+
@Schema(description = "閭", example = "zhangsan@example.com")
@Email(message = "閭鏍煎紡涓嶆纭�")
private String email;
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/HrmSalaryCalculationController.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/HrmSalaryCalculationController.java
index b90e2bc..81958ca 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/HrmSalaryCalculationController.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/HrmSalaryCalculationController.java
@@ -163,7 +163,7 @@
@GetMapping("/export-excel")
@Operation(summary = "瀵煎嚭钖叕鏍哥畻 Excel")
- @PreAuthorize("@ss.hasPermission('hrm:salary:export')")
+ @PreAuthorize("@ss.hasAnyPermissions('hrm:salary:export', 'hrm:salary-calculation:export')")
@ApiAccessLog(operateType = EXPORT)
public void exportSalaryCalculationExcel(@Valid HrmSalaryCalculationPageReqVO pageReqVO,
HttpServletResponse response) throws IOException {
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/employee/HrmEmployeeServiceImpl.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/employee/HrmEmployeeServiceImpl.java
index 11de820..0e6ffcc 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/employee/HrmEmployeeServiceImpl.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/employee/HrmEmployeeServiceImpl.java
@@ -28,6 +28,7 @@
import cn.iocoder.yudao.module.hrm.dal.mysql.employee.HrmEmployeeMapper;
import cn.iocoder.yudao.module.hrm.dal.mysql.employee.HrmEmployeeWorkHistoryMapper;
import cn.iocoder.yudao.module.hrm.dal.redis.HrmNoRedisDAO;
+import cn.iocoder.yudao.module.infra.api.config.ConfigApi;
import cn.iocoder.yudao.module.system.api.dept.DeptApi;
import cn.iocoder.yudao.module.system.api.dept.PostApi;
import cn.iocoder.yudao.module.system.api.dept.dto.DeptRespDTO;
@@ -87,6 +88,13 @@
@Resource
private MesCalTeamApi mesCalTeamApi;
@Resource
+ private ConfigApi configApi;
+
+ /**
+ * 鐢ㄦ埛鍒濆瀵嗙爜鐨勭郴缁熷弬鏁伴厤缃」
+ */
+ private static final String USER_INIT_PASSWORD_KEY = "system.user.init-password";
+ @Resource
@Lazy // 鑷敞鍏ラ渶寤惰繜鍔犺浇锛屽惁鍒� bean 琚唬鐞嗗寘瑁呭悗娉ㄥ叆鍘熷鐗堟湰瀵艰嚧鍚姩澶辫触
private HrmEmployeeService self;
@@ -108,7 +116,8 @@
userCreateReqDTO.setDeptId(createReqVO.getDeptId());
userCreateReqDTO.setPostIds(Collections.singleton(createReqVO.getPostId()));
userCreateReqDTO.setMobile(createReqVO.getPhone());
- userCreateReqDTO.setPassword(createReqVO.getPhone());
+ // 鍒濆瀵嗙爜锛氫紭鍏堢敤瀵煎叆/鏂板鏃舵寚瀹氱殑瀵嗙爜锛屽惁鍒欒鍙栫郴缁熷弬鏁帮紱涓よ�呴兘娌℃湁鍒欐姤閿�
+ userCreateReqDTO.setPassword(resolveInitialPassword(createReqVO.getPassword()));
userCreateReqDTO.setSex(createReqVO.getGender());
userCreateReqDTO.setEmail(createReqVO.getEmail());
userCreateReqDTO.setRemark(createReqVO.getRemark());
@@ -186,6 +195,11 @@
}
employeeMapper.updateById(updateObj);
Long employeeId = updateReqVO.getId();
+
+ // 鍚屾绯荤粺鐢ㄦ埛瀵嗙爜锛氫粎褰撴樉寮忓~鍐欎簡瀵嗙爜鏃舵墠鏇存柊锛屾湭濉啓淇濇寔鍘熷瘑鐮佷笉鍙�
+ if (StrUtil.isNotBlank(updateReqVO.getPassword()) && employee.getUserId() != null) {
+ adminUserApi.updateUserPassword(employee.getUserId(), updateReqVO.getPassword());
+ }
// 鍚屾鏁欒偛缁忓巻
syncEducationList(employeeId, updateReqVO.getEducations());
@@ -413,6 +427,23 @@
return respVO;
}
+ /**
+ * 瑙f瀽鍛樺伐鍒濆瀵嗙爜锛�
+ * 1. 瀵煎叆/鏂板鏃舵樉寮忔寚瀹氫簡瀵嗙爜锛屼紭鍏堜娇鐢紱
+ * 2. 鏈寚瀹氬垯璇诲彇绯荤粺鍙傛暟 {@code system.user.init-password}锛�
+ * 3. 涓よ�呴兘娌℃湁鏃舵槑纭姤閿欙紝閬垮厤鎮勬倓鐢ㄦ墜鏈哄彿绛夊急鍙d护鍏滃簳銆�
+ */
+ private String resolveInitialPassword(String specifiedPassword) {
+ if (StrUtil.isNotBlank(specifiedPassword)) {
+ return specifiedPassword;
+ }
+ String initPassword = configApi.getConfigValueByKey(USER_INIT_PASSWORD_KEY);
+ if (StrUtil.isBlank(initPassword)) {
+ throw exception(EMPLOYEE_INIT_PASSWORD_NOT_CONFIGURED);
+ }
+ return initPassword;
+ }
+
private HrmEmployeeSaveReqVO buildImportSaveReqVO(HrmEmployeeImportExcelVO importEmployee,
Long deptId, Long postId, Set<Long> roleIds) {
if (StrUtil.isBlank(importEmployee.getName())) {
@@ -428,6 +459,7 @@
reqVO.setName(importEmployee.getName());
reqVO.setGender(importEmployee.getGender() != null ? importEmployee.getGender() : 1); // 榛樿鐢�
reqVO.setPhone(importEmployee.getPhone());
+ reqVO.setPassword(importEmployee.getPassword());
reqVO.setDeptId(deptId);
reqVO.setPostId(postId);
reqVO.setRoleIds(CollUtil.isEmpty(roleIds) ? null : new ArrayList<>(roleIds));
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/task/vo/MesProTaskRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/task/vo/MesProTaskRespVO.java
index f08dea8..33f8de4 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/task/vo/MesProTaskRespVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/task/vo/MesProTaskRespVO.java
@@ -1,5 +1,7 @@
package cn.iocoder.yudao.module.mes.controller.admin.pro.task.vo;
+import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
+import cn.idev.excel.annotation.ExcelProperty;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
@@ -9,33 +11,40 @@
@Schema(description = "绠$悊鍚庡彴 - MES 鐢熶骇浠诲姟 Response VO")
@Data
+@ExcelIgnoreUnannotated
public class MesProTaskRespVO {
@Schema(description = "缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
private Long id;
@Schema(description = "浠诲姟缂栫爜", example = "PT202503150001")
+ @ExcelProperty("浠诲姟缂栫爜")
private String code;
@Schema(description = "浠诲姟鍚嶇О", example = "娉ㄥ浠诲姟")
+ @ExcelProperty("浠诲姟鍚嶇О")
private String name;
@Schema(description = "鐢熶骇宸ュ崟缂栧彿", example = "1")
private Long workOrderId;
@Schema(description = "宸ュ崟缂栫爜", example = "WO-001")
+ @ExcelProperty("鐢熶骇宸ュ崟缂栧彿")
private String workOrderCode;
@Schema(description = "宸ュ崟鍚嶇О", example = "鐢熶骇宸ュ崟-A")
+ @ExcelProperty("鐢熶骇宸ュ崟鍚嶇О")
private String workOrderName;
@Schema(description = "宸ヤ綔绔欑紪鍙�", example = "1")
private Long workstationId;
@Schema(description = "宸ヤ綔绔欑紪鐮�", example = "WS-001")
+ @ExcelProperty("宸ヤ綔绔欑紪鐮�")
private String workstationCode;
@Schema(description = "宸ヤ綔绔欏悕绉�", example = "娉ㄥ宸ヤ綔绔�")
+ @ExcelProperty("宸ヤ綔绔�")
private String workstationName;
@Schema(description = "宸ヨ壓璺嚎缂栧彿", example = "1")
@@ -45,51 +54,65 @@
private Long processId;
@Schema(description = "宸ュ簭鍚嶇О", example = "娉ㄥ")
+ @ExcelProperty("宸ュ簭")
private String processName;
@Schema(description = "鐝粍缂栧彿", example = "1")
private Long teamId;
@Schema(description = "鐝粍鍚嶇О", example = "杩愮淮涓�鐝�")
+ @ExcelProperty("鐝粍")
private String teamName;
@Schema(description = "浜у搧鐗╂枡缂栧彿", example = "100")
private Long itemId;
@Schema(description = "浜у搧缂栫爜", example = "P-001")
+ @ExcelProperty("鐗╂枡缂栫爜")
private String itemCode;
@Schema(description = "浜у搧鍚嶇О", example = "鐢佃矾鏉�")
+ @ExcelProperty("鐗╂枡鍚嶇О")
private String itemName;
@Schema(description = "瑙勬牸鍨嬪彿", example = "100x200mm")
+ @ExcelProperty("瑙勬牸鍨嬪彿")
private String itemSpecification;
@Schema(description = "璁¢噺鍗曚綅鍚嶇О", example = "涓�")
+ @ExcelProperty("鍗曚綅")
private String unitMeasureName;
@Schema(description = "鎺掍骇鏁伴噺", example = "100.00")
+ @ExcelProperty("璁″垝鏁伴噺")
private BigDecimal quantity;
@Schema(description = "宸茬敓浜ф暟閲�", example = "50.00")
+ @ExcelProperty("宸茬敓浜ф暟閲�")
private BigDecimal producedQuantity;
@Schema(description = "鍚堟牸鍝佹暟閲�", example = "48.00")
+ @ExcelProperty("鍚堟牸鏁伴噺")
private BigDecimal qualifyQuantity;
@Schema(description = "涓嶈壇鍝佹暟閲�", example = "2.00")
+ @ExcelProperty("涓嶅悎鏍兼暟閲�")
private BigDecimal unqualifyQuantity;
@Schema(description = "寰呮姤宸ユ暟閲�", example = "50.00")
+ @ExcelProperty("寰呯敓浜ф暟閲�")
private BigDecimal pendingQuantity;
@Schema(description = "鍦ㄩ�旀姤宸ユ暟閲�", example = "20.00")
+ @ExcelProperty("鍦ㄩ�旀姤宸ユ暟閲�")
private BigDecimal inTransitQuantity;
@Schema(description = "鍙姤宸ユ暟閲�", example = "30.00")
+ @ExcelProperty("鍙姤宸ユ暟閲�")
private BigDecimal reportableQuantity;
@Schema(description = "鎶ュ伐瀹屾垚鐜�(%)", example = "50.00")
+ @ExcelProperty("鎶ュ伐瀹屾垚鐜�(%)")
private BigDecimal feedbackRate;
@Schema(description = "璋冩暣鏁伴噺", example = "0")
@@ -99,42 +122,54 @@
private Long clientId;
@Schema(description = "瀹㈡埛鍚嶇О", example = "瀹㈡埛A")
+ @ExcelProperty("瀹㈡埛")
private String clientName;
@Schema(description = "寮�濮嬬敓浜ф椂闂�")
+ @ExcelProperty("寮�濮嬬敓浜ф椂闂�")
private LocalDateTime startTime;
@Schema(description = "鐢熶骇鏃堕暱锛堝伐浣滄棩锛�", example = "3")
+ @ExcelProperty("鐢熶骇鏃堕暱(宸ヤ綔鏃�)")
private Integer duration;
@Schema(description = "缁撴潫鐢熶骇鏃堕棿")
+ @ExcelProperty("缁撴潫鐢熶骇鏃堕棿")
private LocalDateTime endTime;
@Schema(description = "鐢樼壒鍥炬樉绀洪鑹�", example = "#00AEF3")
private String colorCode;
@Schema(description = "闇�姹傛棩鏈�")
+ @ExcelProperty("闇�姹傛棩鏈�")
private LocalDateTime requestDate;
@Schema(description = "瀹屾垚鏃ユ湡")
+ @ExcelProperty("瀹屾垚鏃ユ湡")
private LocalDateTime finishDate;
@Schema(description = "鍙栨秷鏃ユ湡")
+ @ExcelProperty("鍙栨秷鏃ユ湡")
private LocalDateTime cancelDate;
@Schema(description = "浠诲姟鐘舵��", example = "0")
+ @ExcelProperty("浠诲姟鐘舵��")
private Integer status;
@Schema(description = "鏄惁璐ㄦ锛堟淳鐢熻嚜宸ヨ壓璺嚎宸ュ簭 checkFlag锛�", example = "true")
+ @ExcelProperty("鏄惁璐ㄦ")
private Boolean checkFlag;
@Schema(description = "鏄惁鍊掑啿锛堟淳鐢熻嚜宸ヨ壓璺嚎宸ュ簭 backflushFlag锛�", example = "true")
+ @ExcelProperty("鏄惁鍊掑啿")
private Boolean backflushFlag;
@Schema(description = "澶囨敞", example = "澶囨敞")
+ @ExcelProperty("澶囨敞")
private String remark;
@Schema(description = "鍒涘缓鏃堕棿", requiredMode = Schema.RequiredMode.REQUIRED)
+ @ExcelProperty("鍒涘缓鏃堕棿")
private LocalDateTime createTime;
@Schema(description = "鍋滃伐鍘嗗彶璁板綍")
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/miscissue/vo/MesWmMiscIssueRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/miscissue/vo/MesWmMiscIssueRespVO.java
index 565868d..4867e05 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/miscissue/vo/MesWmMiscIssueRespVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/miscissue/vo/MesWmMiscIssueRespVO.java
@@ -1,5 +1,7 @@
package cn.iocoder.yudao.module.mes.controller.admin.wm.miscissue.vo;
+import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
+import cn.idev.excel.annotation.ExcelProperty;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
@@ -7,50 +9,63 @@
@Schema(description = "绠$悊鍚庡彴 - MES 鏉傞」鍑哄簱鍗� Response VO")
@Data
+@ExcelIgnoreUnannotated
public class MesWmMiscIssueRespVO {
@Schema(description = "缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
private Long id;
@Schema(description = "鍑哄簱鍗曠紪鍙�", requiredMode = Schema.RequiredMode.REQUIRED, example = "MI20260302001")
+ @ExcelProperty("鍑哄簱鍗曠紪鍙�")
private String code;
@Schema(description = "鍑哄簱鍗曞悕绉�", requiredMode = Schema.RequiredMode.REQUIRED, example = "搴撳瓨璋冩暣鍑哄簱")
+ @ExcelProperty("鍑哄簱鍗曞悕绉�")
private String name;
@Schema(description = "鏉傞」绫诲瀷", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+ @ExcelProperty("鏉傞」绫诲瀷")
private Integer type;
@Schema(description = "鏉ユ簮鍗曟嵁绫诲瀷", example = "PURCHASE_ORDER")
+ @ExcelProperty("鏉ユ簮鍗曟嵁绫诲瀷")
private String sourceDocType;
@Schema(description = "鏉ユ簮鍗曟嵁ID", example = "1")
private Long sourceDocId;
@Schema(description = "鏉ユ簮鍗曟嵁缂栧彿", example = "DOC20260302001")
+ @ExcelProperty("鏉ユ簮鍗曟嵁缂栧彿")
private String sourceDocCode;
@Schema(description = "鍑哄簱鏃ユ湡", requiredMode = Schema.RequiredMode.REQUIRED)
+ @ExcelProperty("鍑哄簱鏃ユ湡")
private LocalDateTime issueDate;
@Schema(description = "鐘舵��", requiredMode = Schema.RequiredMode.REQUIRED, example = "0")
+ @ExcelProperty("鐘舵��")
private Integer status;
@Schema(description = "瀹℃牳浜虹敤鎴风紪鍙�", example = "1")
private Long reviewerId;
@Schema(description = "瀹℃牳浜哄鍚�", example = "寮犱笁")
+ @ExcelProperty("瀹℃牳浜�")
private String reviewerName;
@Schema(description = "瀹℃牳鏃堕棿")
+ @ExcelProperty("瀹℃牳鏃堕棿")
private LocalDateTime reviewTime;
@Schema(description = "瀹℃牳鎰忚锛堥�氳繃鏃剁殑鎰忚 / 涓嶉�氳繃鏃剁殑鍘熷洜锛�", example = "鍑哄簱鏁伴噺闇�鍐嶆鏍稿")
+ @ExcelProperty("瀹℃牳鎰忚")
private String reviewRemark;
@Schema(description = "澶囨敞", example = "澶囨敞")
+ @ExcelProperty("澶囨敞")
private String remark;
@Schema(description = "鍒涘缓鏃堕棿", requiredMode = Schema.RequiredMode.REQUIRED)
+ @ExcelProperty("鍒涘缓鏃堕棿")
private LocalDateTime createTime;
}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/miscreceipt/vo/MesWmMiscReceiptRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/miscreceipt/vo/MesWmMiscReceiptRespVO.java
index 4991cd9..7bca3a7 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/miscreceipt/vo/MesWmMiscReceiptRespVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/miscreceipt/vo/MesWmMiscReceiptRespVO.java
@@ -1,5 +1,7 @@
package cn.iocoder.yudao.module.mes.controller.admin.wm.miscreceipt.vo;
+import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
+import cn.idev.excel.annotation.ExcelProperty;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
@@ -7,50 +9,63 @@
@Schema(description = "绠$悊鍚庡彴 - MES 鏉傞」鍏ュ簱鍗� Response VO")
@Data
+@ExcelIgnoreUnannotated
public class MesWmMiscReceiptRespVO {
@Schema(description = "缂栧彿", example = "1024")
private Long id;
@Schema(description = "鍏ュ簱鍗曠紪鐮�", example = "MR2026030001")
+ @ExcelProperty("鍏ュ簱鍗曠紪鐮�")
private String code;
@Schema(description = "鍏ュ簱鍗曞悕绉�", example = "閫�鏂欏叆搴撳崟")
+ @ExcelProperty("鍏ュ簱鍗曞悕绉�")
private String name;
@Schema(description = "鏉傞」绫诲瀷", example = "1")
+ @ExcelProperty("鏉傞」绫诲瀷")
private Integer type;
@Schema(description = "鏉ユ簮鍗曟嵁绫诲瀷", example = "WORK_ORDER")
+ @ExcelProperty("鏉ユ簮鍗曟嵁绫诲瀷")
private String sourceDocType;
@Schema(description = "鏉ユ簮鍗曟嵁 ID", example = "1")
private Long sourceDocId;
@Schema(description = "鏉ユ簮鍗曟嵁缂栫爜", example = "WO2026030001")
+ @ExcelProperty("鏉ユ簮鍗曟嵁缂栫爜")
private String sourceDocCode;
@Schema(description = "鍏ュ簱鏃ユ湡")
+ @ExcelProperty("鍏ュ簱鏃ユ湡")
private LocalDateTime receiptDate;
@Schema(description = "鐘舵��", example = "0")
+ @ExcelProperty("鐘舵��")
private Integer status;
@Schema(description = "瀹℃牳浜虹敤鎴风紪鍙�", example = "1")
private Long reviewerId;
@Schema(description = "瀹℃牳浜哄鍚�", example = "寮犱笁")
+ @ExcelProperty("瀹℃牳浜�")
private String reviewerName;
@Schema(description = "瀹℃牳鏃堕棿")
+ @ExcelProperty("瀹℃牳鏃堕棿")
private LocalDateTime reviewTime;
@Schema(description = "瀹℃牳鎰忚锛堥�氳繃鏃剁殑鎰忚 / 涓嶉�氳繃鏃剁殑鍘熷洜锛�", example = "鍏ュ簱鏁伴噺闇�鍐嶆鏍稿")
+ @ExcelProperty("瀹℃牳鎰忚")
private String reviewRemark;
@Schema(description = "澶囨敞", example = "澶囨敞")
+ @ExcelProperty("澶囨敞")
private String remark;
@Schema(description = "鍒涘缓鏃堕棿")
+ @ExcelProperty("鍒涘缓鏃堕棿")
private LocalDateTime createTime;
}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productissue/vo/MesWmProductIssueRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productissue/vo/MesWmProductIssueRespVO.java
index a60c044..434c480 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productissue/vo/MesWmProductIssueRespVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productissue/vo/MesWmProductIssueRespVO.java
@@ -1,5 +1,7 @@
package cn.iocoder.yudao.module.mes.controller.admin.wm.productissue.vo;
+import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
+import cn.idev.excel.annotation.ExcelProperty;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
@@ -7,60 +9,74 @@
@Schema(description = "绠$悊鍚庡彴 - MES 棰嗘枡鍑哄簱鍗� Response VO")
@Data
+@ExcelIgnoreUnannotated
public class MesWmProductIssueRespVO {
@Schema(description = "缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
private Long id;
@Schema(description = "棰嗘枡鍗曠紪鍙�", requiredMode = Schema.RequiredMode.REQUIRED, example = "ISSUE20250226001")
+ @ExcelProperty("棰嗘枡鍗曠紪鍙�")
private String code;
@Schema(description = "棰嗘枡鍗曞悕绉�", requiredMode = Schema.RequiredMode.REQUIRED, example = "鐢熶骇棰嗘枡")
+ @ExcelProperty("棰嗘枡鍗曞悕绉�")
private String name;
@Schema(description = "鐢熶骇宸ュ崟 ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
private Long workOrderId;
@Schema(description = "鐢熶骇宸ュ崟缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "WO20250226001")
+ @ExcelProperty("鐢熶骇宸ュ崟缂栧彿")
private String workOrderCode;
@Schema(description = "宸ヤ綔绔� ID", example = "1")
private Long workstationId;
@Schema(description = "宸ヤ綔绔欏悕绉�", example = "瑁呴厤宸ヤ綔绔�")
+ @ExcelProperty("宸ヤ綔绔�")
private String workstationName;
@Schema(description = "瀹㈡埛缂栧彿", example = "C001")
private String clientCode;
@Schema(description = "瀹㈡埛鍚嶇О", example = "鏌愭煇瀹㈡埛")
+ @ExcelProperty("瀹㈡埛")
private String clientName;
@Schema(description = "鐢熶骇浠诲姟 ID", example = "1")
private Long taskId;
@Schema(description = "鐢熶骇浠诲姟缂栫爜", example = "TASK001")
+ @ExcelProperty("鐢熶骇浠诲姟缂栫爜")
private String taskCode;
@Schema(description = "鐢熶骇浠诲姟鍚嶇О", example = "娉ㄥ浠诲姟")
+ @ExcelProperty("鐢熶骇浠诲姟鍚嶇О")
private String taskName;
@Schema(description = "棰嗘枡鏃ユ湡")
+ @ExcelProperty("棰嗘枡鏃ユ湡")
private LocalDateTime issueDate;
@Schema(description = "闇�姹傛椂闂�", requiredMode = Schema.RequiredMode.REQUIRED)
+ @ExcelProperty("闇�姹傛椂闂�")
private LocalDateTime requiredTime;
@Schema(description = "鍗曟嵁绫诲瀷锛�1=姝e父棰嗘枡锛�2=绱ф�ヨˉ鏂欙級", example = "1")
+ @ExcelProperty("鍗曟嵁绫诲瀷")
private Integer issueType;
@Schema(description = "鐘舵��", requiredMode = Schema.RequiredMode.REQUIRED, example = "10")
+ @ExcelProperty("鐘舵��")
private Integer status;
@Schema(description = "澶囨敞", example = "澶囨敞")
+ @ExcelProperty("澶囨敞")
private String remark;
@Schema(description = "鍒涘缓鏃堕棿", requiredMode = Schema.RequiredMode.REQUIRED)
+ @ExcelProperty("鍒涘缓鏃堕棿")
private LocalDateTime createTime;
}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnissue/vo/MesWmReturnIssueRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnissue/vo/MesWmReturnIssueRespVO.java
index 04357e9..262dc1a 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnissue/vo/MesWmReturnIssueRespVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnissue/vo/MesWmReturnIssueRespVO.java
@@ -1,5 +1,7 @@
package cn.iocoder.yudao.module.mes.controller.admin.wm.returnissue.vo;
+import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
+import cn.idev.excel.annotation.ExcelProperty;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
@@ -7,51 +9,63 @@
@Schema(description = "绠$悊鍚庡彴 - MES 鐢熶骇閫�鏂欏崟 Response VO")
@Data
+@ExcelIgnoreUnannotated
public class MesWmReturnIssueRespVO {
@Schema(description = "缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
private Long id;
@Schema(description = "閫�鏂欏崟缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "RI20250226001")
+ @ExcelProperty("閫�鏂欏崟缂栧彿")
private String code;
@Schema(description = "閫�鏂欏崟鍚嶇О", requiredMode = Schema.RequiredMode.REQUIRED, example = "鐢熶骇閫�鏂�")
+ @ExcelProperty("閫�鏂欏崟鍚嶇О")
private String name;
@Schema(description = "鐢熶骇宸ュ崟 ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
private Long workOrderId;
@Schema(description = "鐢熶骇宸ュ崟缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "WO20250226001")
+ @ExcelProperty("鐢熶骇宸ュ崟缂栧彿")
private String workOrderCode;
@Schema(description = "鐢熶骇浠诲姟 ID", example = "1")
private Long taskId;
@Schema(description = "鐢熶骇浠诲姟缂栫爜", example = "TASK001")
+ @ExcelProperty("鐢熶骇浠诲姟缂栫爜")
private String taskCode;
@Schema(description = "鐢熶骇浠诲姟鍚嶇О", example = "娉ㄥ浠诲姟")
+ @ExcelProperty("鐢熶骇浠诲姟鍚嶇О")
private String taskName;
@Schema(description = "宸ヤ綔绔� ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
private Long workstationId;
@Schema(description = "宸ヤ綔绔欏悕绉�", example = "瑁呴厤宸ヤ綔绔�")
+ @ExcelProperty("宸ヤ綔绔�")
private String workstationName;
@Schema(description = "閫�鏂欑被鍨�", example = "1")
+ @ExcelProperty("閫�鏂欑被鍨�")
private Integer type;
@Schema(description = "閫�鏂欐棩鏈�")
+ @ExcelProperty("閫�鏂欐棩鏈�")
private LocalDateTime returnDate;
@Schema(description = "鐘舵��", requiredMode = Schema.RequiredMode.REQUIRED, example = "0")
+ @ExcelProperty("鐘舵��")
private Integer status;
@Schema(description = "澶囨敞", example = "澶囨敞")
+ @ExcelProperty("澶囨敞")
private String remark;
@Schema(description = "鍒涘缓鏃堕棿", requiredMode = Schema.RequiredMode.REQUIRED)
+ @ExcelProperty("鍒涘缓鏃堕棿")
private LocalDateTime createTime;
}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnsales/vo/MesWmReturnSalesRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnsales/vo/MesWmReturnSalesRespVO.java
index 8d50c3c..62b391f 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnsales/vo/MesWmReturnSalesRespVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnsales/vo/MesWmReturnSalesRespVO.java
@@ -1,5 +1,7 @@
package cn.iocoder.yudao.module.mes.controller.admin.wm.returnsales.vo;
+import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
+import cn.idev.excel.annotation.ExcelProperty;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
@@ -13,42 +15,52 @@
*/
@Schema(description = "绠$悊鍚庡彴 - MES 閿�鍞��璐у崟 Response VO")
@Data
+@ExcelIgnoreUnannotated
public class MesWmReturnSalesRespVO {
@Schema(description = "缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
private Long id;
@Schema(description = "閫�璐у崟缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "RS202603010001")
+ @ExcelProperty("閫�璐у崟缂栧彿")
private String code;
@Schema(description = "閫�璐у崟鍚嶇О", requiredMode = Schema.RequiredMode.REQUIRED, example = "閿�鍞��璐�")
+ @ExcelProperty("閫�璐у崟鍚嶇О")
private String name;
@Schema(description = "閿�鍞鍗� ID", example = "1")
private Long saleOrderId;
@Schema(description = "閿�鍞鍗曠紪鍙�", example = "SO202603010001")
+ @ExcelProperty("閿�鍞鍗曠紪鍙�")
private String salesOrderCode;
@Schema(description = "瀹㈡埛 ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
private Long clientId;
@Schema(description = "瀹㈡埛鍚嶇О", example = "XX瀹㈡埛")
+ @ExcelProperty("瀹㈡埛")
private String clientName;
@Schema(description = "閫�璐ф棩鏈�")
+ @ExcelProperty("閫�璐ф棩鏈�")
private LocalDate returnDate;
@Schema(description = "閫�璐у師鍥�", example = "璐ㄩ噺闂")
+ @ExcelProperty("閫�璐у師鍥�")
private String returnReason;
@Schema(description = "鐘舵��", requiredMode = Schema.RequiredMode.REQUIRED, example = "0")
+ @ExcelProperty("鐘舵��")
private Integer status;
@Schema(description = "澶囨敞", example = "澶囨敞")
+ @ExcelProperty("澶囨敞")
private String remark;
@Schema(description = "鍒涘缓鏃堕棿", requiredMode = Schema.RequiredMode.REQUIRED)
+ @ExcelProperty("鍒涘缓鏃堕棿")
private LocalDateTime createTime;
}
\ No newline at end of file
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnvendor/vo/MesWmReturnVendorRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnvendor/vo/MesWmReturnVendorRespVO.java
index f18f995..967563a 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnvendor/vo/MesWmReturnVendorRespVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnvendor/vo/MesWmReturnVendorRespVO.java
@@ -1,5 +1,7 @@
package cn.iocoder.yudao.module.mes.controller.admin.wm.returnvendor.vo;
+import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
+import cn.idev.excel.annotation.ExcelProperty;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
@@ -7,63 +9,79 @@
@Schema(description = "绠$悊鍚庡彴 - MES 渚涘簲鍟嗛��璐у崟 Response VO")
@Data
+@ExcelIgnoreUnannotated
public class MesWmReturnVendorRespVO {
@Schema(description = "缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
private Long id;
@Schema(description = "閫�璐у崟缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "RV20250226001")
+ @ExcelProperty("閫�璐у崟缂栧彿")
private String code;
@Schema(description = "閫�璐у崟鍚嶇О", requiredMode = Schema.RequiredMode.REQUIRED, example = "渚涘簲鍟嗛��璐�")
+ @ExcelProperty("閫�璐у崟鍚嶇О")
private String name;
@Schema(description = "閲囪喘璁㈠崟缂栧彿", example = "PO20250226001")
+ @ExcelProperty("閲囪喘璁㈠崟缂栧彿")
private String purchaseOrderCode;
@Schema(description = "渚涘簲鍟� ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
private Long vendorId;
@Schema(description = "渚涘簲鍟嗙紪鐮�", example = "V001")
+ @ExcelProperty("渚涘簲鍟嗙紪鐮�")
private String vendorCode;
@Schema(description = "渚涘簲鍟嗗悕绉�", example = "XX渚涘簲鍟�")
+ @ExcelProperty("渚涘簲鍟嗗悕绉�")
private String vendorName;
@Schema(description = "渚涘簲鍟嗙畝绉�", example = "XX")
private String vendorNickname;
@Schema(description = "閫�璐ф棩鏈�")
+ @ExcelProperty("閫�璐ф棩鏈�")
private LocalDateTime returnDate;
@Schema(description = "閫�璐у師鍥�", example = "璐ㄩ噺涓嶅悎鏍�")
+ @ExcelProperty("閫�璐у師鍥�")
private String returnReason;
@Schema(description = "鐗╂祦鍗曞彿", example = "SF1234567890")
+ @ExcelProperty("鐗╂祦鍗曞彿")
private String transportCode;
@Schema(description = "鐗╂祦鑱旂郴鐢佃瘽", example = "13800138000")
+ @ExcelProperty("鐗╂祦鑱旂郴鐢佃瘽")
private String transportTelephone;
@Schema(description = "鐘舵��", requiredMode = Schema.RequiredMode.REQUIRED, example = "10")
+ @ExcelProperty("鐘舵��")
private Integer status;
@Schema(description = "瀹℃牳浜虹敤鎴风紪鍙�", example = "1")
private Long reviewerId;
@Schema(description = "瀹℃牳浜哄鍚�", example = "寮犱笁")
+ @ExcelProperty("瀹℃牳浜�")
private String reviewerName;
@Schema(description = "瀹℃牳鏃堕棿")
+ @ExcelProperty("瀹℃牳鏃堕棿")
private LocalDateTime reviewTime;
@Schema(description = "瀹℃牳鎰忚锛堥�氳繃鏃剁殑鎰忚 / 涓嶉�氳繃鏃剁殑鍘熷洜锛�", example = "閫�璐ф暟閲忛渶鍐嶆鏍稿")
+ @ExcelProperty("瀹℃牳鎰忚")
private String reviewRemark;
@Schema(description = "澶囨敞", example = "澶囨敞")
+ @ExcelProperty("澶囨敞")
private String remark;
@Schema(description = "鍒涘缓鏃堕棿", requiredMode = Schema.RequiredMode.REQUIRED)
+ @ExcelProperty("鍒涘缓鏃堕棿")
private LocalDateTime createTime;
}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/transfer/vo/MesWmTransferRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/transfer/vo/MesWmTransferRespVO.java
index e9ce237..941711f 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/transfer/vo/MesWmTransferRespVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/transfer/vo/MesWmTransferRespVO.java
@@ -1,5 +1,7 @@
package cn.iocoder.yudao.module.mes.controller.admin.wm.transfer.vo;
+import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
+import cn.idev.excel.annotation.ExcelProperty;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
@@ -7,48 +9,62 @@
@Schema(description = "绠$悊鍚庡彴 - MES 杞Щ鍗� Response VO")
@Data
+@ExcelIgnoreUnannotated
public class MesWmTransferRespVO {
@Schema(description = "缂栧彿", example = "1")
private Long id;
@Schema(description = "杞Щ鍗曠紪鍙�", example = "TR2026020001")
+ @ExcelProperty("杞Щ鍗曠紪鍙�")
private String code;
@Schema(description = "杞Щ鍗曞悕绉�", example = "閽㈡澘杞Щ鍗�")
+ @ExcelProperty("杞Щ鍗曞悕绉�")
private String name;
@Schema(description = "杞Щ鍗曠被鍨�", example = "1")
+ @ExcelProperty("杞Щ鍗曠被鍨�")
private Integer type;
@Schema(description = "鏄惁閰嶉��", example = "true")
+ @ExcelProperty("鏄惁閰嶉��")
private Boolean deliveryFlag;
@Schema(description = "鏀惰揣浜�", example = "寮犱笁")
+ @ExcelProperty("鏀惰揣浜�")
private String recipientName;
@Schema(description = "鑱旂郴鏂瑰紡", example = "13800138000")
+ @ExcelProperty("鑱旂郴鏂瑰紡")
private String recipientTelephone;
@Schema(description = "鐩殑鍦�", example = "涓婃捣甯傛郸涓滄柊鍖�")
+ @ExcelProperty("鐩殑鍦�")
private String destinationAddress;
@Schema(description = "鎵胯繍鍟�", example = "椤轰赴閫熻繍")
+ @ExcelProperty("鎵胯繍鍟�")
private String carrier;
@Schema(description = "杩愯緭鍗曞彿", example = "SF123456789")
+ @ExcelProperty("杩愯緭鍗曞彿")
private String shippingNumber;
@Schema(description = "鏄惁宸茬‘璁�", example = "false")
+ @ExcelProperty("鏄惁宸茬‘璁�")
private Boolean confirmFlag;
@Schema(description = "杞Щ鏃ユ湡")
+ @ExcelProperty("杞Щ鏃ユ湡")
private LocalDateTime transferDate;
@Schema(description = "鍗曟嵁鐘舵��", example = "0")
+ @ExcelProperty("鍗曟嵁鐘舵��")
private Integer status;
@Schema(description = "澶囨敞", example = "澶囨敞淇℃伅")
+ @ExcelProperty("澶囨敞")
private String remark;
}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pro/mps/MesProMpsMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pro/mps/MesProMpsMapper.java
index bbb7b79..e38e8a3 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pro/mps/MesProMpsMapper.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pro/mps/MesProMpsMapper.java
@@ -63,6 +63,19 @@
return selectOne(MesProMpsDO::getCode, code);
}
+ /**
+ * 鎸夊伐鍗曟煡璇� MPS銆�
+ *
+ * 鍚堝苟涓嬪彂鏃跺涓� MPS 浼氭寚鍚戝悓涓�涓伐鍗曪紝鍥犳杩欓噷蹇呴』闄愬埗鍙彇涓�鏉★紝
+ * 鍚﹀垯 MyBatis-Plus 鐨� selectOne 浼氭姏 TooManyResultsException锛屽鑷存姤宸ユ棤娉曞畬宸ャ��
+ */
+ default MesProMpsDO selectByWorkOrderId(Long workOrderId) {
+ return selectOne(new LambdaQueryWrapperX<MesProMpsDO>()
+ .eq(MesProMpsDO::getWorkOrderId, workOrderId)
+ .orderByDesc(MesProMpsDO::getId)
+ .last("LIMIT 1"));
+ }
+
default MesProMpsDO selectBySaleOrderItemId(Long saleOrderItemId) {
return selectOne(new LambdaQueryWrapperX<MesProMpsDO>()
.eq(MesProMpsDO::getSaleOrderItemId, saleOrderItemId)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/mps/MesProMpsServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/mps/MesProMpsServiceImpl.java
index 848f5d2..3c491d9 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/mps/MesProMpsServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/mps/MesProMpsServiceImpl.java
@@ -402,7 +402,7 @@
if (workOrderId == null) {
return null;
}
- return mpsMapper.selectOne(MesProMpsDO::getWorkOrderId, workOrderId);
+ return mpsMapper.selectByWorkOrderId(workOrderId);
}
@Override
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/supplier/vo/SrmSupplierRespVO.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/supplier/vo/SrmSupplierRespVO.java
index 5b92d72..a0914c2 100644
--- a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/supplier/vo/SrmSupplierRespVO.java
+++ b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/supplier/vo/SrmSupplierRespVO.java
@@ -1,5 +1,7 @@
package cn.iocoder.yudao.module.srm.controller.admin.supplier.vo;
+import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
+import cn.idev.excel.annotation.ExcelProperty;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
@@ -8,66 +10,86 @@
@Schema(description = "绠$悊鍚庡彴 - 渚涘簲鍟� Response VO")
@Data
+@ExcelIgnoreUnannotated
public class SrmSupplierRespVO {
@Schema(description = "渚涘簲鍟咺D")
private Long id;
@Schema(description = "渚涘簲鍟嗙紪鐮�")
+ @ExcelProperty("渚涘簲鍟嗙紪鐮�")
private String code;
@Schema(description = "渚涘簲鍟嗗悕绉�")
+ @ExcelProperty("渚涘簲鍟嗗悕绉�")
private String name;
@Schema(description = "渚涘簲鍟嗙畝绉�")
+ @ExcelProperty("渚涘簲鍟嗙畝绉�")
private String shortName;
@Schema(description = "渚涘簲鍟嗙被鍨�")
+ @ExcelProperty("渚涘簲鍟嗙被鍨�")
private String type;
@Schema(description = "浼佷笟鎬ц川")
+ @ExcelProperty("鍏徃鎬ц川")
private String companyNature;
@Schema(description = "娉ㄥ唽璧勯噾锛堜竾鍏冿級")
+ @ExcelProperty("娉ㄥ唽璧勬湰")
private BigDecimal registeredCapital;
@Schema(description = "钀ヤ笟鎵х収缂栧彿")
+ @ExcelProperty("钀ヤ笟鎵х収鍙�")
private String businessLicenseNo;
@Schema(description = "绋庡彿")
+ @ExcelProperty("绋庡彿")
private String taxNo;
@Schema(description = "娉曚汉浠h〃")
+ @ExcelProperty("娉曚汉")
private String legalPerson;
@Schema(description = "鍏徃鍦板潃")
+ @ExcelProperty("鍦板潃")
private String address;
@Schema(description = "鍏徃缃戝潃")
+ @ExcelProperty("缃戝潃")
private String website;
@Schema(description = "鑱旂郴浜�")
+ @ExcelProperty("鑱旂郴浜�")
private String contactName;
@Schema(description = "鑱旂郴鐢佃瘽")
+ @ExcelProperty("鑱旂郴鐢佃瘽")
private String contactMobile;
@Schema(description = "閭")
+ @ExcelProperty("鑱旂郴閭")
private String contactEmail;
@Schema(description = "寮�鎴烽摱琛�")
+ @ExcelProperty("寮�鎴烽摱琛�")
private String bankName;
@Schema(description = "閾惰璐﹀彿")
+ @ExcelProperty("閾惰璐﹀彿")
private String bankAccount;
@Schema(description = "鐘舵�侊紙0鍚敤 1绂佺敤锛�")
+ @ExcelProperty("鐘舵��")
private Integer status;
@Schema(description = "澶囨敞")
+ @ExcelProperty("澶囨敞")
private String remark;
@Schema(description = "鍒涘缓鏃堕棿")
+ @ExcelProperty("鍒涘缓鏃堕棿")
private LocalDateTime createTime;
}
diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/api/user/AdminUserApi.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/api/user/AdminUserApi.java
index 4445377..6622898 100644
--- a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/api/user/AdminUserApi.java
+++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/api/user/AdminUserApi.java
@@ -25,6 +25,14 @@
Long createUser(AdminUserCreateReqDTO createReqDTO);
/**
+ * 鏇存柊鐢ㄦ埛瀵嗙爜
+ *
+ * @param id 鐢ㄦ埛缂栧彿
+ * @param password 鏄庢枃瀵嗙爜
+ */
+ void updateUserPassword(Long id, String password);
+
+ /**
* 閫氳繃鐢ㄦ埛 ID 鏌ヨ鐢ㄦ埛
*
* @param id 鐢ㄦ埛ID
diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/api/user/AdminUserApiImpl.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/api/user/AdminUserApiImpl.java
index f68064a..e06e14b 100644
--- a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/api/user/AdminUserApiImpl.java
+++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/api/user/AdminUserApiImpl.java
@@ -36,6 +36,11 @@
private DeptService deptService;
@Override
+ public void updateUserPassword(Long id, String password) {
+ userService.updateUserPassword(id, password);
+ }
+
+ @Override
public Long createUser(AdminUserCreateReqDTO createReqDTO) {
UserSaveReqVO createReqVO = new UserSaveReqVO();
createReqVO.setUsername(createReqDTO.getUsername());
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..e5c792b 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
@@ -33,6 +33,9 @@
@ExcelProperty("鎵嬫満鍙风爜")
private String mobile;
+ @ExcelProperty("鍒濆瀵嗙爜")
+ private String password;
+
@ExcelProperty(value = "鐢ㄦ埛鎬у埆", converter = DictConvert.class)
@DictFormat(DictTypeConstants.USER_SEX)
private Integer sex;
diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImpl.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImpl.java
index be474d2..dd46571 100644
--- a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImpl.java
+++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImpl.java
@@ -512,11 +512,8 @@
if (CollUtil.isEmpty(importUsers)) {
throw exception(USER_IMPORT_LIST_IS_EMPTY);
}
- // 1.2 鍒濆鍖栧瘑鐮佷笉鑳戒负绌�
+ // 1.2 绯荤粺鍙傛暟涓殑鍒濆瀵嗙爜锛屼綔涓� Excel 鏈~鍐欏瘑鐮佹椂鐨勫厹搴�
String initPassword = configApi.getConfigValueByKey(USER_INIT_PASSWORD_KEY);
- if (StrUtil.isEmpty(initPassword)) {
- throw exception(USER_IMPORT_INIT_PASSWORD);
- }
// 2. 閬嶅巻锛岄�愪釜鍒涘缓 or 鏇存柊
UserImportRespVO respVO = UserImportRespVO.builder().createUsernames(new ArrayList<>())
@@ -524,11 +521,20 @@
AtomicInteger index = new AtomicInteger(1);
importUsers.forEach(importUser -> {
int currentIndex = index.getAndIncrement();
+ String key = StrUtil.blankToDefault(importUser.getUsername(), "绗� " + currentIndex + " 琛�");
+ // 2.1.0 瑙f瀽璇ヨ鍒濆瀵嗙爜锛欵xcel 濉啓浜嗗氨鐢ㄥ~鍐欑殑锛屽惁鍒欒鍙栫郴缁熷弬鏁�
+ String effectivePassword = StrUtil.isNotBlank(importUser.getPassword())
+ ? importUser.getPassword() : initPassword;
+ if (StrUtil.isBlank(effectivePassword)) {
+ respVO.getFailureUsernames().put(key,
+ "鏈~鍐欏垵濮嬪瘑鐮侊紝涓旂郴缁熷弬鏁� system.user.init-password 鏈厤缃��"
+ + "璇峰湪 Excel 涓~鍐欒琛屽垵濮嬪瘑鐮侊紝鎴栧厛鍦ㄥ弬鏁拌缃腑閰嶇疆 system.user.init-password");
+ return;
+ }
// 2.1.1 鏍¢獙瀛楁鏄惁绗﹀悎瑕佹眰
try {
- ValidationUtils.validate(BeanUtils.toBean(importUser, UserSaveReqVO.class).setPassword(initPassword));
+ ValidationUtils.validate(BeanUtils.toBean(importUser, UserSaveReqVO.class).setPassword(effectivePassword));
} catch (ConstraintViolationException ex) {
- String key = StrUtil.blankToDefault(importUser.getUsername(), "绗� " + currentIndex + " 琛�");
respVO.getFailureUsernames().put(key, ex.getMessage());
return;
}
@@ -545,7 +551,7 @@
AdminUserDO existUser = userMapper.selectByUsername(importUser.getUsername());
if (existUser == null) {
userMapper.insert(BeanUtils.toBean(importUser, AdminUserDO.class)
- .setPassword(encodePassword(initPassword)).setPostIds(new HashSet<>())); // 璁剧疆榛樿瀵嗙爜鍙婄┖宀椾綅缂栧彿鏁扮粍
+ .setPassword(encodePassword(effectivePassword)).setPostIds(new HashSet<>())); // 璁剧疆鍒濆瀵嗙爜鍙婄┖宀椾綅缂栧彿鏁扮粍
respVO.getCreateUsernames().add(importUser.getUsername());
return;
}
@@ -556,6 +562,9 @@
}
AdminUserDO updateUser = BeanUtils.toBean(importUser, AdminUserDO.class);
updateUser.setId(existUser.getId());
+ // 瀵嗙爜鍗曠嫭澶勭悊锛欵xcel 濉啓浜嗘墠鏇存柊锛涙湭濉啓鍒欑疆绌猴紝淇濇寔鍘熷瘑鐮佷笉鍙橈紙閬垮厤鎶婃槑鏂囧啓杩涘簱锛�
+ updateUser.setPassword(StrUtil.isNotBlank(importUser.getPassword())
+ ? encodePassword(importUser.getPassword()) : null);
userMapper.updateById(updateUser);
respVO.getUpdateUsernames().add(importUser.getUsername());
});
--
Gitblit v1.9.3