From 962f78c8383e7c884ddb08c951c15e5ba6eb4cb8 Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期五, 23 十月 2026 15:43:33 +0800
Subject: [PATCH] fix: 完善审批流程与业务状态校验
---
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/listener/ErpPurchasePlanStatusListener.java | 11
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnvendor/MesWmReturnVendorService.java | 4
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemreceipt/MesWmItemReceiptService.java | 7
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnvendor/MesWmReturnVendorServiceImpl.java | 27 +
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchasePlanServiceImpl.java | 19 +
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/stocktaking/task/MesWmStockTakingTaskService.java | 9
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/approval/HrmTransferApplicationServiceImpl.java | 18
yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/util/FlowableUtils.java | 5
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contract/CrmContractController.java | 2
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/approval/HrmResignationApplicationServiceImpl.java | 22 +
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/attendance/HrmAttendanceRecordServiceImpl.java | 7
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/refund/CrmRefundMapper.java | 4
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/mysql/approval/HrmResignationApplicationMapper.java | 4
yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/BpmProcessInstanceController.java | 18 +
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/miscreceipt/MesWmMiscReceiptServiceImpl.java | 1
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/mysql/attendance/HrmAttendanceExceptionMapper.java | 8
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/purchase/ErpPurchaseRequestMapper.java | 4
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseOrderServiceImpl.java | 22 +
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/enums/ErrorCodeConstants.java | 6
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/cancellation/CrmCancellationMapper.java | 4
sql/mysql/mes_em_energy_init.sql | 4
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemreceipt/MesWmItemReceiptServiceImpl.java | 18
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/purchase/ErpPurchaseOrderMapper.java | 4
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/feedback/MesProFeedbackServiceImpl.java | 23 +
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/stocktaking/task/MesWmStockTakingTaskResultServiceImpl.java | 31 +
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/ErrorCodeConstants.java | 7
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/approval/HrmLeaveApplicationServiceImpl.java | 22 +
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/invoice/CrmInvoiceMapper.java | 3
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pd/techconfirm/vo/ProductTechConfirmSaveReqVO.java | 2
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/mysql/approval/HrmTransferApplicationMapper.java | 8
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/invoice/CrmInvoiceServiceImpl.java | 21 +
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/performanceappraise/HrmPerformanceAppraiseServiceImpl.java | 24 +
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/mysql/approval/HrmRegularizeApplicationMapper.java | 4
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/stocktaking/task/MesWmStockTakingTaskLineServiceImpl.java | 2
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/vo/HrmAttendanceExceptionSaveReqVO.java | 3
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/mysql/approval/HrmLeaveApplicationMapper.java | 3
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pd/processparamtemplate/vo/MesPdProcessParamTemplateSaveReqVO.java | 3
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/stocktaking/task/MesWmStockTakingTaskServiceImpl.java | 8
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/approval/HrmRegularizeApplicationServiceImpl.java | 22 +
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pd/techconfirm/ProductTechConfirmServiceImpl.java | 5
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pd/project/MesPdProjectServiceImpl.java | 3
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnvendor/MesWmReturnVendorDetailServiceImpl.java | 16 +
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/contract/CrmContractMapper.java | 3
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/cancellation/CrmCancellationServiceImpl.java | 48 ++-
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/contract/CrmContractServiceImpl.java | 28 +
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/attendance/HrmAttendanceExceptionServiceImpl.java | 37 ++
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pd/processparamtemplate/MesPdProcessParamTemplateServiceImpl.java | 27 +
yudao-server/src/main/resources/application-local.yaml | 10
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseRequestServiceImpl.java | 24 +
yudao-module-hrm-api/src/main/java/cn/iocoder/yudao/module/hrm/enums/ErrorCodeConstants.java | 3
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/purchase/ErpPurchasePlanMapper.java | 4
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/refund/CrmRefundServiceImpl.java | 48 ++-
yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/dal/mysql/compensation/AfterSaleCompensationMapper.java | 6
yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/service/compensation/AfterSaleCompensationServiceImpl.java | 22 +
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/finance/ErpFinancePaymentServiceImpl.java | 16
yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/enums/ErrorCodeConstants.java | 1
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/finance/ErpFinancePaymentMapper.java | 2
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/miscissue/MesWmMiscIssueServiceImpl.java | 13
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/mysql/performanceappraise/HrmPerformanceAppraiseMapper.java | 4
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/invoice/CrmInvoiceController.java | 1
60 files changed, 556 insertions(+), 179 deletions(-)
diff --git a/sql/mysql/mes_em_energy_init.sql b/sql/mysql/mes_em_energy_init.sql
index 6401603..904ab89 100644
--- a/sql/mysql/mes_em_energy_init.sql
+++ b/sql/mysql/mes_em_energy_init.sql
@@ -195,8 +195,8 @@
-- 鍥犳鍏堟寜涓婚敭琛ユ彃鐖剁洰褰曪紱宸插瓨鍦ㄦ椂浠呮仮澶嶅垹闄ゆ爣璁帮紝涓嶆敼鍔ㄥ師鏈夊悕绉板拰璺緞銆�
INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`, `updater`, `update_time`, `deleted`)
VALUES
-(1065864, '鑳借�楃鐞�', '', 1, 16, 0, '/energyManagement', 'monitor', NULL, NULL, 0, b'1', b'1', b'1', '1', NOW(), '1', NOW(), b'0')
-ON DUPLICATE KEY UPDATE `deleted` = b'0', `status` = 0, `visible` = b'1', `updater` = '1', `update_time` = NOW();
+(1065864, '鑳借�楃鐞�', '', 1, 16, 0, '/energyManagement', 'ep:lightning', NULL, NULL, 0, b'1', b'1', b'1', '1', NOW(), '1', NOW(), b'0')
+ON DUPLICATE KEY UPDATE `icon` = 'ep:lightning', `deleted` = b'0', `status` = 0, `visible` = b'1', `updater` = '1', `update_time` = NOW();
INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`, `updater`, `update_time`, `deleted`)
VALUES
diff --git a/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/dal/mysql/compensation/AfterSaleCompensationMapper.java b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/dal/mysql/compensation/AfterSaleCompensationMapper.java
index 59c48be..2873a52 100644
--- a/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/dal/mysql/compensation/AfterSaleCompensationMapper.java
+++ b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/dal/mysql/compensation/AfterSaleCompensationMapper.java
@@ -5,6 +5,7 @@
import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
import cn.iocoder.yudao.module.aftersales.controller.admin.compensation.vo.AfterSaleCompensationPageReqVO;
import cn.iocoder.yudao.module.aftersales.dal.dataobject.compensation.AfterSaleCompensationDO;
+import cn.iocoder.yudao.module.aftersales.enums.AfterSaleCompensationAuditStatusEnum;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import org.apache.ibatis.annotations.Mapper;
@@ -33,6 +34,9 @@
default int submitAndResetAuditInfo(Long id, Integer status) {
return update(null, new LambdaUpdateWrapper<AfterSaleCompensationDO>()
.eq(AfterSaleCompensationDO::getId, id)
+ .in(AfterSaleCompensationDO::getAuditStatus,
+ AfterSaleCompensationAuditStatusEnum.DRAFT.getStatus(),
+ AfterSaleCompensationAuditStatusEnum.REJECT.getStatus())
.set(AfterSaleCompensationDO::getAuditStatus, status)
.set(AfterSaleCompensationDO::getReviewerId, null)
.set(AfterSaleCompensationDO::getReviewerName, null)
@@ -56,6 +60,8 @@
String reviewerName, String reviewRemark) {
return update(null, new LambdaUpdateWrapper<AfterSaleCompensationDO>()
.eq(AfterSaleCompensationDO::getId, id)
+ .eq(AfterSaleCompensationDO::getAuditStatus,
+ AfterSaleCompensationAuditStatusEnum.PROCESS.getStatus())
.set(AfterSaleCompensationDO::getAuditStatus, status)
.set(AfterSaleCompensationDO::getReviewerId, reviewerId)
.set(AfterSaleCompensationDO::getReviewerName, reviewerName)
diff --git a/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/enums/ErrorCodeConstants.java b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/enums/ErrorCodeConstants.java
index 2b8c7a2..267be1a 100644
--- a/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/enums/ErrorCodeConstants.java
+++ b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/enums/ErrorCodeConstants.java
@@ -44,5 +44,6 @@
ErrorCode COMPENSATION_DELETE_FAIL_NOT_DRAFT = new ErrorCode(1_022_004_004, "璧斾粯鍗曚笉鏄崏绋跨姸鎬侊紝鏃犳硶鍒犻櫎");
ErrorCode COMPENSATION_TICKET_NOT_EXISTS = new ErrorCode(1_022_004_005, "鍏宠仈鐨勫敭鍚庡伐鍗曚笉瀛樺湪");
ErrorCode COMPENSATION_AUDIT_REJECT_REASON_REQUIRED = new ErrorCode(1_022_004_006, "瀹℃牳涓嶉�氳繃鏃跺繀椤诲~鍐欎笉閫氳繃鍘熷洜");
+ ErrorCode COMPENSATION_UPDATE_FAIL_NOT_EDITABLE = new ErrorCode(1_022_004_007, "鍙湁鏈彁浜ゆ垨瀹℃牳涓嶉�氳繃鐘舵�佺殑璧斾粯鍗曟墠鑳戒慨鏀�");
}
diff --git a/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/service/compensation/AfterSaleCompensationServiceImpl.java b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/service/compensation/AfterSaleCompensationServiceImpl.java
index ab4bfab..a3b24ee 100644
--- a/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/service/compensation/AfterSaleCompensationServiceImpl.java
+++ b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/service/compensation/AfterSaleCompensationServiceImpl.java
@@ -69,8 +69,9 @@
if (exists == null) {
throw exception(ErrorCodeConstants.COMPENSATION_NOT_EXISTS);
}
- if (ObjUtil.notEqual(exists.getAuditStatus(), AfterSaleCompensationAuditStatusEnum.DRAFT.getStatus())) {
- throw exception(ErrorCodeConstants.COMPENSATION_DELETE_FAIL_NOT_DRAFT);
+ if (ObjUtil.notEqual(exists.getAuditStatus(), AfterSaleCompensationAuditStatusEnum.DRAFT.getStatus())
+ && ObjUtil.notEqual(exists.getAuditStatus(), AfterSaleCompensationAuditStatusEnum.REJECT.getStatus())) {
+ throw exception(ErrorCodeConstants.COMPENSATION_UPDATE_FAIL_NOT_EDITABLE);
}
AfterSaleCompensationDO entity = BeanUtils.toBean(updateReqVO, AfterSaleCompensationDO.class, req -> req
.setCompensationNo(exists.getCompensationNo())
@@ -115,7 +116,10 @@
approvalConfigApi.validateApprovalEnabledAndGetApprovers(COMPENSATION_APPROVE_BIZ_TYPE);
// 3. 鐘舵�佺疆涓哄鎵逛腑锛屽苟娓呯┖涓婁竴杞鏍哥粨鏋滐紝閬垮厤娈嬬暀銆屽鏍镐笉閫氳繃銆嶇殑鍘熷洜
- compensationMapper.submitAndResetAuditInfo(id, AfterSaleCompensationAuditStatusEnum.PROCESS.getStatus());
+ if (compensationMapper.submitAndResetAuditInfo(id,
+ AfterSaleCompensationAuditStatusEnum.PROCESS.getStatus()) != 1) {
+ throw exception(ErrorCodeConstants.COMPENSATION_SUBMIT_FAIL_NOT_EDITABLE);
+ }
}
@Override
@@ -140,13 +144,17 @@
if (StrUtil.isBlank(reviewRemark)) {
throw exception(ErrorCodeConstants.COMPENSATION_AUDIT_REJECT_REASON_REQUIRED);
}
- compensationMapper.auditCompensation(id, AfterSaleCompensationAuditStatusEnum.REJECT.getStatus(),
- userId, getUserNickname(userId), reviewRemark);
+ if (compensationMapper.auditCompensation(id, AfterSaleCompensationAuditStatusEnum.REJECT.getStatus(),
+ userId, getUserNickname(userId), reviewRemark) != 1) {
+ throw exception(ErrorCodeConstants.COMPENSATION_AUDIT_FAIL_NOT_PROCESS);
+ }
return;
}
// 5. 瀹℃牳閫氳繃锛氳褰曞鏍镐汉涓庡鏍告剰瑙侊紝鐘舵�佺疆涓哄鏍搁�氳繃
- compensationMapper.auditCompensation(id, AfterSaleCompensationAuditStatusEnum.APPROVE.getStatus(),
- userId, getUserNickname(userId), reviewRemark);
+ if (compensationMapper.auditCompensation(id, AfterSaleCompensationAuditStatusEnum.APPROVE.getStatus(),
+ userId, getUserNickname(userId), reviewRemark) != 1) {
+ throw exception(ErrorCodeConstants.COMPENSATION_AUDIT_FAIL_NOT_PROCESS);
+ }
// 6. 瀹℃牳閫氳繃鍚庣殑鍚庣疆涓氬姟閫昏緫锛氬綋鍓嶈禂浠樺崟瀹℃壒閫氳繃鍚庢棤鑷姩鐢熸垚涓嬫父鍗曟嵁鐨勫姩浣滐紝
// 鏀粯鐘舵�侊紙payStatus锛夊緟鍚庣画鎺ュ叆璐㈠姟妯″潡鏃跺啀鑱斿姩銆�
}
diff --git a/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/BpmProcessInstanceController.java b/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/BpmProcessInstanceController.java
index 7d5705b..b11af88 100644
--- a/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/BpmProcessInstanceController.java
+++ b/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/BpmProcessInstanceController.java
@@ -215,16 +215,24 @@
if (historicProcessInstance == null) {
throw exception(PROCESS_INSTANCE_NOT_EXISTS);
}
- AdminUserRespDTO startUser = adminUserApi.getUser(Long.valueOf(historicProcessInstance.getStartUserId()));
- DeptRespDTO dept = deptApi.getDept(startUser.getDeptId());
+ // 鍙戣捣浜� / 閮ㄩ棬鍙兘涓嶅瓨鍦紙鍘嗗彶鏁版嵁銆佺敤鎴峰凡鍒犻櫎锛夛紝闇�鍋氱┖鍊间繚鎶�
+ AdminUserRespDTO startUser = adminUserApi.getUser(NumberUtils.parseLong(historicProcessInstance.getStartUserId()));
+ DeptRespDTO dept = startUser != null && startUser.getDeptId() != null
+ ? deptApi.getDept(startUser.getDeptId()) : null;
List<HistoricTaskInstance> tasks = taskService.getFinishedTaskListByProcessInstanceIdWithoutCancel(processInstanceId);
Map<Long, AdminUserRespDTO> userMap = adminUserApi.getUserMap(
- convertSet(tasks, item -> Long.valueOf(item.getAssignee())));
+ convertSet(tasks, item -> NumberUtils.parseLong(item.getAssignee())));
+ UserSimpleBaseVO startUserVO = new UserSimpleBaseVO();
+ if (startUser != null) {
+ startUserVO.setNickname(startUser.getNickname());
+ }
+ if (dept != null) {
+ startUserVO.setDeptName(dept.getName());
+ }
BpmProcessPrintDataRespVO printData = BpmProcessInstanceConvert.INSTANCE.buildProcessInstancePrintData(
historicProcessInstance,
processDefinitionService.getProcessDefinitionInfo(historicProcessInstance.getProcessDefinitionId()),
- tasks, userMap,
- new UserSimpleBaseVO().setNickname(startUser.getNickname()).setDeptName(dept.getName()));
+ tasks, userMap, startUserVO);
// 濉厖涓氬姟闄勪欢閰嶇疆锛屽疄鐜版墦鍗拌嚜鍔ㄥ睍绀哄閮ㄤ笟鍔′俊鎭�
businessAttachService.fillBusinessForm(printData.getProcessInstance().getProcessDefinition(),
processDefinitionService.getProcessDefinition(historicProcessInstance.getProcessDefinitionId()).getKey(),
diff --git a/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/util/FlowableUtils.java b/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/util/FlowableUtils.java
index 3242dec..e1b325b 100644
--- a/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/util/FlowableUtils.java
+++ b/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/util/FlowableUtils.java
@@ -246,7 +246,10 @@
return null;
}
- // 瑙f瀽琛ㄥ崟閰嶇疆
+ // 瑙f瀽琛ㄥ崟閰嶇疆銆傞儴鍒嗗巻鍙叉祦绋嬪畾涔夋病鏈夐厤缃〃鍗曞瓧娈碉紙form_fields 涓虹┖锛夛紝姝ゆ椂鏃犳硶鐢熸垚鎽樿锛岀洿鎺ヨ繑鍥�
+ if (ObjectUtil.isEmpty(processDefinitionInfo.getFormFields())) {
+ return null;
+ }
Map<String, BpmFormFieldVO> formFieldsMap = new LinkedHashMap<>();
processDefinitionInfo.getFormFields().forEach(formFieldStr -> {
JsonNode formFieldNode = JsonUtils.parseObject(formFieldStr, JsonNode.class);
diff --git a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contract/CrmContractController.java b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contract/CrmContractController.java
index 9bb01b2..cd3ce7d 100644
--- a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contract/CrmContractController.java
+++ b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contract/CrmContractController.java
@@ -151,6 +151,7 @@
@GetMapping("/page-by-customer")
@Operation(summary = "鑾峰緱鍚堝悓鍒嗛〉锛屽熀浜庢寚瀹氬鎴�")
+ @PreAuthorize("@ss.hasPermission('crm:contract:query')")
public CommonResult<PageResult<CrmContractRespVO>> getContractPageByCustomer(@Valid CrmContractPageReqVO pageVO) {
Assert.notNull(pageVO.getCustomerId(), "瀹㈡埛缂栧彿涓嶈兘涓虹┖");
PageResult<CrmContractDO> pageResult = contractService.getContractPageByCustomerId(pageVO);
@@ -159,6 +160,7 @@
@GetMapping("/page-by-business")
@Operation(summary = "鑾峰緱鍚堝悓鍒嗛〉锛屽熀浜庢寚瀹氬晢鏈�")
+ @PreAuthorize("@ss.hasPermission('crm:contract:query')")
public CommonResult<PageResult<CrmContractRespVO>> getContractPageByBusiness(@Valid CrmContractPageReqVO pageVO) {
Assert.notNull(pageVO.getBusinessId(), "鍟嗘満缂栧彿涓嶈兘涓虹┖");
PageResult<CrmContractDO> pageResult = contractService.getContractPageByBusinessId(pageVO);
diff --git a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/invoice/CrmInvoiceController.java b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/invoice/CrmInvoiceController.java
index 4d6da14..fa3e5c3 100644
--- a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/invoice/CrmInvoiceController.java
+++ b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/invoice/CrmInvoiceController.java
@@ -127,6 +127,7 @@
@GetMapping("/page-by-customer")
@Operation(summary = "鑾峰緱寮�绁ㄥ垎椤碉紝鍩轰簬鎸囧畾瀹㈡埛")
+ @PreAuthorize("@ss.hasPermission('crm:invoice:query')")
public CommonResult<PageResult<CrmInvoiceRespVO>> getInvoicePageByCustomer(@Valid CrmInvoicePageReqVO pageReqVO) {
Assert.notNull(pageReqVO.getCustomerId(), "瀹㈡埛缂栧彿涓嶈兘涓虹┖");
PageResult<CrmInvoiceDO> pageResult = invoiceService.getInvoicePageByCustomerId(pageReqVO);
diff --git a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/cancellation/CrmCancellationMapper.java b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/cancellation/CrmCancellationMapper.java
index 1b7b536..a6acc44 100644
--- a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/cancellation/CrmCancellationMapper.java
+++ b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/cancellation/CrmCancellationMapper.java
@@ -5,6 +5,7 @@
import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
import cn.iocoder.yudao.module.crm.controller.admin.cancellation.vo.CrmCancellationPageReqVO;
import cn.iocoder.yudao.module.crm.dal.dataobject.cancellation.CrmCancellationDO;
+import cn.iocoder.yudao.module.crm.enums.common.CrmAuditStatusEnum;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import org.apache.ibatis.annotations.Mapper;
@@ -31,6 +32,8 @@
default int submitAndResetAuditInfo(Long id, Integer status) {
return update(null, new LambdaUpdateWrapper<CrmCancellationDO>()
.eq(CrmCancellationDO::getId, id)
+ .in(CrmCancellationDO::getAuditStatus, CrmAuditStatusEnum.DRAFT.getStatus(),
+ CrmAuditStatusEnum.REJECT.getStatus())
.set(CrmCancellationDO::getAuditStatus, status)
.set(CrmCancellationDO::getReviewerId, null)
.set(CrmCancellationDO::getReviewerName, null)
@@ -54,6 +57,7 @@
String reviewerName, String reviewRemark) {
return update(null, new LambdaUpdateWrapper<CrmCancellationDO>()
.eq(CrmCancellationDO::getId, id)
+ .eq(CrmCancellationDO::getAuditStatus, CrmAuditStatusEnum.PROCESS.getStatus())
.set(CrmCancellationDO::getAuditStatus, status)
.set(CrmCancellationDO::getReviewerId, reviewerId)
.set(CrmCancellationDO::getReviewerName, reviewerName)
diff --git a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/contract/CrmContractMapper.java b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/contract/CrmContractMapper.java
index 8562c87..a05fd5f 100644
--- a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/contract/CrmContractMapper.java
+++ b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/contract/CrmContractMapper.java
@@ -51,6 +51,8 @@
default int submitAndResetAuditInfo(Long id, Integer status) {
return update(null, new LambdaUpdateWrapper<CrmContractDO>()
.eq(CrmContractDO::getId, id)
+ .in(CrmContractDO::getAuditStatus, CrmAuditStatusEnum.DRAFT.getStatus(),
+ CrmAuditStatusEnum.REJECT.getStatus())
.set(CrmContractDO::getAuditStatus, status)
.set(CrmContractDO::getReviewerId, null)
.set(CrmContractDO::getReviewerName, null)
@@ -74,6 +76,7 @@
String reviewerName, String reviewRemark) {
return update(null, new LambdaUpdateWrapper<CrmContractDO>()
.eq(CrmContractDO::getId, id)
+ .eq(CrmContractDO::getAuditStatus, CrmAuditStatusEnum.PROCESS.getStatus())
.set(CrmContractDO::getAuditStatus, status)
.set(CrmContractDO::getReviewerId, reviewerId)
.set(CrmContractDO::getReviewerName, reviewerName)
diff --git a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/invoice/CrmInvoiceMapper.java b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/invoice/CrmInvoiceMapper.java
index 0f9cdee..a0e76bb 100644
--- a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/invoice/CrmInvoiceMapper.java
+++ b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/invoice/CrmInvoiceMapper.java
@@ -49,6 +49,8 @@
default int submitAndResetAuditInfo(Long id, Integer status) {
return update(null, new LambdaUpdateWrapper<CrmInvoiceDO>()
.eq(CrmInvoiceDO::getId, id)
+ .in(CrmInvoiceDO::getAuditStatus, CrmAuditStatusEnum.DRAFT.getStatus(),
+ CrmAuditStatusEnum.REJECT.getStatus())
.set(CrmInvoiceDO::getAuditStatus, status)
.set(CrmInvoiceDO::getReviewerId, null)
.set(CrmInvoiceDO::getReviewerName, null)
@@ -72,6 +74,7 @@
String reviewerName, String reviewRemark) {
return update(null, new LambdaUpdateWrapper<CrmInvoiceDO>()
.eq(CrmInvoiceDO::getId, id)
+ .eq(CrmInvoiceDO::getAuditStatus, CrmAuditStatusEnum.PROCESS.getStatus())
.set(CrmInvoiceDO::getAuditStatus, status)
.set(CrmInvoiceDO::getReviewerId, reviewerId)
.set(CrmInvoiceDO::getReviewerName, reviewerName)
diff --git a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/refund/CrmRefundMapper.java b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/refund/CrmRefundMapper.java
index 4ff9c7f..2b86217 100644
--- a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/refund/CrmRefundMapper.java
+++ b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/refund/CrmRefundMapper.java
@@ -5,6 +5,7 @@
import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
import cn.iocoder.yudao.module.crm.controller.admin.refund.vo.CrmRefundPageReqVO;
import cn.iocoder.yudao.module.crm.dal.dataobject.refund.CrmRefundDO;
+import cn.iocoder.yudao.module.crm.enums.common.CrmAuditStatusEnum;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import org.apache.ibatis.annotations.Mapper;
@@ -31,6 +32,8 @@
default int submitAndResetAuditInfo(Long id, Integer status) {
return update(null, new LambdaUpdateWrapper<CrmRefundDO>()
.eq(CrmRefundDO::getId, id)
+ .in(CrmRefundDO::getAuditStatus, CrmAuditStatusEnum.DRAFT.getStatus(),
+ CrmAuditStatusEnum.REJECT.getStatus())
.set(CrmRefundDO::getAuditStatus, status)
.set(CrmRefundDO::getReviewerId, null)
.set(CrmRefundDO::getReviewerName, null)
@@ -54,6 +57,7 @@
String reviewerName, String reviewRemark) {
return update(null, new LambdaUpdateWrapper<CrmRefundDO>()
.eq(CrmRefundDO::getId, id)
+ .eq(CrmRefundDO::getAuditStatus, CrmAuditStatusEnum.PROCESS.getStatus())
.set(CrmRefundDO::getAuditStatus, status)
.set(CrmRefundDO::getReviewerId, reviewerId)
.set(CrmRefundDO::getReviewerName, reviewerName)
diff --git a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/enums/ErrorCodeConstants.java b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/enums/ErrorCodeConstants.java
index f40bc47..de79265 100644
--- a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/enums/ErrorCodeConstants.java
+++ b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/enums/ErrorCodeConstants.java
@@ -22,6 +22,7 @@
ErrorCode CONTRACT_SUBMIT_FAIL_NOT_EDITABLE = new ErrorCode(1_020_000_010, "鍙湁鏈彁浜ゆ垨瀹℃牳涓嶉�氳繃鐘舵�佺殑鍚堝悓鎵嶈兘鎻愪氦瀹℃壒");
ErrorCode CONTRACT_AUDIT_FAIL_NOT_PROCESS = new ErrorCode(1_020_000_012, "鍙湁瀹℃壒涓姸鎬佺殑鍚堝悓鎵嶈兘瀹℃牳");
ErrorCode CONTRACT_AUDIT_REJECT_REASON_REQUIRED = new ErrorCode(1_020_000_014, "瀹℃牳涓嶉�氳繃鏃跺繀椤诲~鍐欎笉閫氳繃鍘熷洜");
+ ErrorCode CONTRACT_DELETE_FAIL_NOT_EDITABLE = new ErrorCode(1_020_000_015, "鍙湁鏈彁浜ゆ垨瀹℃牳涓嶉�氳繃鐘舵�佺殑鍚堝悓鎵嶈兘鍒犻櫎");
ErrorCode CONTRACT_IMPORT_LIST_IS_EMPTY = new ErrorCode(1_020_000_009, "瀵煎叆鍚堝悓鏁版嵁涓嶈兘涓虹┖锛�");
ErrorCode CONTRACT_NAME_EXISTS = new ErrorCode(1_020_000_011, "宸插瓨鍦ㄥ悎鍚屻�恵}銆戯紝涓旀湭寮�鍚鐩栵紒");
ErrorCode CONTRACT_IMPORT_CUSTOMER_NOT_EXISTS = new ErrorCode(1_020_000_013, "瀹㈡埛銆恵}銆戜笉瀛樺湪锛�");
@@ -187,4 +188,9 @@
ErrorCode CRM_CREDIT_RATING_IMPORT_CUSTOMER_NOT_EXISTS = new ErrorCode(1_020_018_020, "瀹㈡埛銆恵}銆戜笉瀛樺湪锛�");
ErrorCode CRM_CREDIT_RATING_NAME_EXISTS = new ErrorCode(1_020_018_021, "宸插瓨鍦ㄥ鎴枫�恵}銆戠殑淇$敤璇勭骇锛屼笖鏈紑鍚鐩栵紒");
+ ErrorCode CRM_REFUND_UPDATE_FAIL_NOT_EDITABLE = new ErrorCode(1_020_018_022, "鍙湁鑽夌鎴栧鏍镐笉閫氳繃鐘舵�佺殑閫�璐瑰崟鎵嶈兘淇敼");
+ ErrorCode CRM_REFUND_DELETE_FAIL_NOT_EDITABLE = new ErrorCode(1_020_018_023, "鍙湁鑽夌鎴栧鏍镐笉閫氳繃鐘舵�佺殑閫�璐瑰崟鎵嶈兘鍒犻櫎");
+ ErrorCode CRM_CANCELLATION_UPDATE_FAIL_NOT_EDITABLE = new ErrorCode(1_020_018_024, "鍙湁鑽夌鎴栧鏍镐笉閫氳繃鐘舵�佺殑閿�鎴风敵璇锋墠鑳戒慨鏀�");
+ ErrorCode CRM_CANCELLATION_DELETE_FAIL_NOT_EDITABLE = new ErrorCode(1_020_018_025, "鍙湁鑽夌鎴栧鏍镐笉閫氳繃鐘舵�佺殑閿�鎴风敵璇锋墠鑳藉垹闄�");
+
}
diff --git a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/cancellation/CrmCancellationServiceImpl.java b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/cancellation/CrmCancellationServiceImpl.java
index 0a3e14c..34950cf 100644
--- a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/cancellation/CrmCancellationServiceImpl.java
+++ b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/cancellation/CrmCancellationServiceImpl.java
@@ -17,6 +17,7 @@
import cn.iocoder.yudao.module.system.api.approval.ApprovalConfigApi;
import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import jakarta.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
@@ -78,23 +79,36 @@
@Override
public void updateCancellation(CrmCancellationSaveReqVO updateReqVO) {
- // 1. 鏍¢獙瀛樺湪 + 瀹℃牳閫氳繃鐨勯攢鎴风敵璇蜂笉鍏佽淇敼
+ // 1. 鏍¢獙瀛樺湪 + 鍙湁鑽夌銆佸鏍镐笉閫氳繃鍙互淇敼
CrmCancellationDO cancellation = validateCancellationExists(updateReqVO.getId());
- if (ObjUtil.equal(cancellation.getAuditStatus(), CrmAuditStatusEnum.APPROVE.getStatus())) {
- throw exception(ErrorCodeConstants.CRM_CANCELLATION_UPDATE_FAIL_APPROVE);
+ if (ObjUtil.notEqual(cancellation.getAuditStatus(), CrmAuditStatusEnum.DRAFT.getStatus())
+ && ObjUtil.notEqual(cancellation.getAuditStatus(), CrmAuditStatusEnum.REJECT.getStatus())) {
+ throw exception(ErrorCodeConstants.CRM_CANCELLATION_UPDATE_FAIL_NOT_EDITABLE);
}
- // 2. 鏇存柊閿�鎴风敵璇�
+ // 2. 鏇存柊閿�鎴风敵璇凤紱瀹℃壒鐘舵�佷笌瀹℃牳缁撴灉鍙兘鐢辨彁浜�/瀹℃牳鍙樻洿锛屾澶勬樉寮忔竻绌�
CrmCancellationDO entity = BeanUtils.toBean(updateReqVO, CrmCancellationDO.class);
- entity.setAuditStatus(null); // 瀹℃壒鐘舵�佸彧鑳界敱鎻愪氦/瀹℃牳鍙樻洿
- cancellationMapper.updateById(entity);
+ // 瀹℃牳鐩稿叧瀛楁鍙兘鐢辨彁浜�/瀹℃牳鍙樻洿
+ entity.setAuditStatus(null);
+ entity.setReviewerId(null);
+ entity.setReviewerName(null);
+ entity.setReviewTime(null);
+ entity.setReviewRemark(null);
+ cancellationMapper.update(entity, new LambdaUpdateWrapper<CrmCancellationDO>()
+ .eq(CrmCancellationDO::getId, entity.getId())
+ .set(CrmCancellationDO::getAuditStatus, null)
+ .set(CrmCancellationDO::getReviewerId, null)
+ .set(CrmCancellationDO::getReviewerName, null)
+ .set(CrmCancellationDO::getReviewTime, null)
+ .set(CrmCancellationDO::getReviewRemark, null));
}
@Override
public void deleteCancellation(Long id) {
- // 鏍¢獙瀛樺湪 + 瀹℃牳閫氳繃鐨勯攢鎴风敵璇蜂笉鍏佽鍒犻櫎
+ // 鏍¢獙瀛樺湪 + 鍙湁鑽夌銆佸鏍镐笉閫氳繃鍙互鍒犻櫎
CrmCancellationDO cancellation = validateCancellationExists(id);
- if (ObjUtil.equal(cancellation.getAuditStatus(), CrmAuditStatusEnum.APPROVE.getStatus())) {
- throw exception(ErrorCodeConstants.CRM_CANCELLATION_DELETE_FAIL_APPROVE);
+ if (ObjUtil.notEqual(cancellation.getAuditStatus(), CrmAuditStatusEnum.DRAFT.getStatus())
+ && ObjUtil.notEqual(cancellation.getAuditStatus(), CrmAuditStatusEnum.REJECT.getStatus())) {
+ throw exception(ErrorCodeConstants.CRM_CANCELLATION_DELETE_FAIL_NOT_EDITABLE);
}
cancellationMapper.deleteById(id);
}
@@ -129,7 +143,9 @@
approvalConfigApi.validateApprovalEnabledAndGetApprovers(CANCELLATION_APPROVE_BIZ_TYPE);
// 3. 鐘舵�佺疆涓哄鎵逛腑锛屽苟娓呯┖涓婁竴杞鏍哥粨鏋滐紝閬垮厤娈嬬暀銆屽鏍镐笉閫氳繃銆嶇殑鍘熷洜
- cancellationMapper.submitAndResetAuditInfo(id, CrmAuditStatusEnum.PROCESS.getStatus());
+ if (cancellationMapper.submitAndResetAuditInfo(id, CrmAuditStatusEnum.PROCESS.getStatus()) != 1) {
+ throw exception(ErrorCodeConstants.CRM_CANCELLATION_SUBMIT_FAIL_NOT_EDITABLE);
+ }
}
@Override
@@ -154,13 +170,17 @@
if (StrUtil.isBlank(reviewRemark)) {
throw exception(ErrorCodeConstants.CRM_CANCELLATION_AUDIT_REJECT_REASON_REQUIRED);
}
- cancellationMapper.auditCancellation(id, CrmAuditStatusEnum.REJECT.getStatus(),
- userId, getUserNickname(userId), reviewRemark);
+ if (cancellationMapper.auditCancellation(id, CrmAuditStatusEnum.REJECT.getStatus(),
+ userId, getUserNickname(userId), reviewRemark) != 1) {
+ throw exception(ErrorCodeConstants.CRM_CANCELLATION_AUDIT_FAIL_NOT_PROCESS);
+ }
return;
}
// 5. 瀹℃牳閫氳繃锛氳褰曞鏍镐汉涓庡鏍告剰瑙侊紝鐘舵�佺疆涓哄鏍搁�氳繃
- cancellationMapper.auditCancellation(id, CrmAuditStatusEnum.APPROVE.getStatus(),
- userId, getUserNickname(userId), reviewRemark);
+ if (cancellationMapper.auditCancellation(id, CrmAuditStatusEnum.APPROVE.getStatus(),
+ userId, getUserNickname(userId), reviewRemark) != 1) {
+ throw exception(ErrorCodeConstants.CRM_CANCELLATION_AUDIT_FAIL_NOT_PROCESS);
+ }
}
private CrmCancellationDO validateCancellationExists(Long id) {
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 fe3d6ca..3280495 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
@@ -176,9 +176,9 @@
updateReqVO.setOwnerUserId(null); // 涓嶅厑璁告洿鏂扮殑瀛楁
// 1.1 鏍¢獙瀛樺湪
CrmContractDO oldContract = validateContractExists(updateReqVO.getId());
- // 1.2 鍙湁鑽夌銆佸鎵逛腑锛屽彲浠ョ紪杈戯紱
+ // 1.2 鍙湁鑽夌銆佸鏍镐笉閫氳繃锛屽彲浠ョ紪杈戯紱
if (!ObjectUtils.equalsAny(oldContract.getAuditStatus(), CrmAuditStatusEnum.DRAFT.getStatus(),
- CrmAuditStatusEnum.PROCESS.getStatus())) {
+ CrmAuditStatusEnum.REJECT.getStatus())) {
throw exception(CONTRACT_UPDATE_FAIL_NOT_DRAFT);
}
// 1.3 鏍¢獙浜у搧椤圭殑鏈夋晥鎬�
@@ -272,7 +272,12 @@
public void deleteContract(Long id) {
// 1.1 鏍¢獙瀛樺湪
CrmContractDO contract = validateContractExists(id);
- // 1.2 濡傛灉琚� CrmReceivableDO 鎵�浣跨敤锛屽垯涓嶅厑璁稿垹闄�
+ // 1.2 鍙湁鑽夌銆佸鏍镐笉閫氳繃锛屽彲浠ュ垹闄わ紱
+ if (!ObjectUtils.equalsAny(contract.getAuditStatus(), CrmAuditStatusEnum.DRAFT.getStatus(),
+ CrmAuditStatusEnum.REJECT.getStatus())) {
+ throw exception(CONTRACT_DELETE_FAIL_NOT_EDITABLE);
+ }
+ // 1.3 濡傛灉琚� CrmReceivableDO 鎵�浣跨敤锛屽垯涓嶅厑璁稿垹闄�
if (receivableService.getReceivableCountByContractId(contract.getId()) > 0) {
throw exception(CONTRACT_DELETE_FAIL);
}
@@ -351,6 +356,7 @@
@Transactional(rollbackFor = Exception.class)
@LogRecord(type = CRM_CONTRACT_TYPE, subType = CRM_CONTRACT_SUBMIT_SUB_TYPE, bizNo = "{{#id}}",
success = CRM_CONTRACT_SUBMIT_SUCCESS)
+ @CrmPermission(bizType = CrmBizTypeEnum.CRM_CONTRACT, bizId = "#id", level = CrmPermissionLevelEnum.WRITE)
public void submitContract(Long id) {
// 1. 鏍¢獙瀛樺湪 + 鍙彁浜ょ姸鎬侊紙鏈彁浜� / 瀹℃牳涓嶉�氳繃锛�
CrmContractDO contract = validateContractExists(id);
@@ -363,7 +369,9 @@
approvalConfigApi.validateApprovalEnabledAndGetApprovers(CONTRACT_APPROVE_BIZ_TYPE);
// 3. 鐘舵�佺疆涓哄鎵逛腑锛屽苟娓呯┖涓婁竴杞鏍哥粨鏋滐紝閬垮厤娈嬬暀銆屽鏍镐笉閫氳繃銆嶇殑鍘熷洜
- contractMapper.submitAndResetAuditInfo(id, CrmAuditStatusEnum.PROCESS.getStatus());
+ if (contractMapper.submitAndResetAuditInfo(id, CrmAuditStatusEnum.PROCESS.getStatus()) != 1) {
+ throw exception(CONTRACT_SUBMIT_FAIL_NOT_EDITABLE);
+ }
// 4. 璁板綍鏃ュ織
LogRecordContext.putVariable("contractName", contract.getName());
@@ -391,13 +399,17 @@
if (StrUtil.isBlank(reviewRemark)) {
throw exception(CONTRACT_AUDIT_REJECT_REASON_REQUIRED);
}
- contractMapper.auditContract(id, CrmAuditStatusEnum.REJECT.getStatus(),
- userId, getUserNickname(userId), reviewRemark);
+ if (contractMapper.auditContract(id, CrmAuditStatusEnum.REJECT.getStatus(),
+ userId, getUserNickname(userId), reviewRemark) != 1) {
+ throw exception(CONTRACT_AUDIT_FAIL_NOT_PROCESS);
+ }
return;
}
// 5. 瀹℃牳閫氳繃锛氳褰曞鏍镐汉涓庡鏍告剰瑙侊紝鐘舵�佺疆涓哄鏍搁�氳繃
- contractMapper.auditContract(id, CrmAuditStatusEnum.APPROVE.getStatus(),
- userId, getUserNickname(userId), reviewRemark);
+ if (contractMapper.auditContract(id, CrmAuditStatusEnum.APPROVE.getStatus(),
+ userId, getUserNickname(userId), reviewRemark) != 1) {
+ throw exception(CONTRACT_AUDIT_FAIL_NOT_PROCESS);
+ }
}
// ======================= 鏌ヨ鐩稿叧 =======================
diff --git a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/invoice/CrmInvoiceServiceImpl.java b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/invoice/CrmInvoiceServiceImpl.java
index 326a256..7e7b2ad 100644
--- a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/invoice/CrmInvoiceServiceImpl.java
+++ b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/invoice/CrmInvoiceServiceImpl.java
@@ -166,9 +166,9 @@
// 1.2 鏍¢獙鍙紑绁ㄩ噾棰濊秴杩囦笂闄�
validateInvoicePriceExceedsLimit(updateReqVO);
- // 1.3 鍙湁鑽夌銆佸鎵逛腑锛屽彲浠ョ紪杈戯紱
+ // 1.3 鍙湁鑽夌銆佸鏍镐笉閫氳繃锛屽彲浠ョ紪杈戯紱
if (!ObjectUtils.equalsAny(oldInvoice.getAuditStatus(), CrmAuditStatusEnum.DRAFT.getStatus(),
- CrmAuditStatusEnum.PROCESS.getStatus())) {
+ CrmAuditStatusEnum.REJECT.getStatus())) {
throw exception(INVOICE_UPDATE_FAIL_EDITING_PROHIBITED);
}
@@ -213,6 +213,7 @@
@Transactional(rollbackFor = Exception.class)
@LogRecord(type = CRM_INVOICE_TYPE, subType = CRM_INVOICE_SUBMIT_SUB_TYPE, bizNo = "{{#id}}",
success = CRM_INVOICE_SUBMIT_SUCCESS)
+ @CrmPermission(bizType = CrmBizTypeEnum.CRM_INVOICE, bizId = "#id", level = CrmPermissionLevelEnum.WRITE)
public void submitInvoice(Long id) {
// 1. 鏍¢獙瀛樺湪 + 鍙彁浜ょ姸鎬侊紙鏈彁浜� / 瀹℃牳涓嶉�氳繃锛�
CrmInvoiceDO invoice = validateInvoiceExists(id);
@@ -229,7 +230,9 @@
approvalConfigApi.validateApprovalEnabledAndGetApprovers(INVOICE_APPROVE_BIZ_TYPE);
// 4. 鐘舵�佺疆涓哄鎵逛腑锛屽苟娓呯┖涓婁竴杞鏍哥粨鏋滐紝閬垮厤娈嬬暀銆屽鏍镐笉閫氳繃銆嶇殑鍘熷洜
- invoiceMapper.submitAndResetAuditInfo(id, CrmAuditStatusEnum.PROCESS.getStatus());
+ if (invoiceMapper.submitAndResetAuditInfo(id, CrmAuditStatusEnum.PROCESS.getStatus()) != 1) {
+ throw exception(INVOICE_SUBMIT_FAIL_NOT_EDITABLE);
+ }
// 5. 璁板綍鏃ュ織
LogRecordContext.putVariable("invoiceNo", invoice.getNo());
@@ -257,14 +260,18 @@
if (StrUtil.isBlank(reviewRemark)) {
throw exception(INVOICE_AUDIT_REJECT_REASON_REQUIRED);
}
- invoiceMapper.auditInvoice(id, CrmAuditStatusEnum.REJECT.getStatus(),
- userId, getUserNickname(userId), reviewRemark);
+ if (invoiceMapper.auditInvoice(id, CrmAuditStatusEnum.REJECT.getStatus(),
+ userId, getUserNickname(userId), reviewRemark) != 1) {
+ throw exception(INVOICE_AUDIT_FAIL_NOT_PROCESS);
+ }
return;
}
// 5. 瀹℃牳閫氳繃锛氳褰曞鏍镐汉涓庡鏍告剰瑙侊紝鐘舵�佺疆涓哄鏍搁�氳繃
// 锛堝紑绁ㄦ棤棰濆鍚庣疆涓氬姟閫昏緫锛屽鎵归�氳繃鍚庡嵆鍙敤浜庡垱寤哄洖娆� / 鍏宠仈寮�绁ㄩ�夋嫨锛�
- invoiceMapper.auditInvoice(id, CrmAuditStatusEnum.APPROVE.getStatus(),
- userId, getUserNickname(userId), reviewRemark);
+ if (invoiceMapper.auditInvoice(id, CrmAuditStatusEnum.APPROVE.getStatus(),
+ userId, getUserNickname(userId), reviewRemark) != 1) {
+ throw exception(INVOICE_AUDIT_FAIL_NOT_PROCESS);
+ }
}
/**
diff --git a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/refund/CrmRefundServiceImpl.java b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/refund/CrmRefundServiceImpl.java
index 9d3adad..2d23a94 100644
--- a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/refund/CrmRefundServiceImpl.java
+++ b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/refund/CrmRefundServiceImpl.java
@@ -17,6 +17,7 @@
import cn.iocoder.yudao.module.system.api.approval.ApprovalConfigApi;
import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import jakarta.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
@@ -78,23 +79,36 @@
@Override
public void updateRefund(CrmRefundSaveReqVO updateReqVO) {
- // 1. 鏍¢獙瀛樺湪 + 瀹℃牳閫氳繃鐨勯��璐瑰崟涓嶅厑璁镐慨鏀�
+ // 1. 鏍¢獙瀛樺湪 + 鍙湁鑽夌銆佸鏍镐笉閫氳繃鍙互淇敼
CrmRefundDO refund = validateRefundExists(updateReqVO.getId());
- if (ObjUtil.equal(refund.getAuditStatus(), CrmAuditStatusEnum.APPROVE.getStatus())) {
- throw exception(ErrorCodeConstants.CRM_REFUND_UPDATE_FAIL_APPROVE);
+ if (ObjUtil.notEqual(refund.getAuditStatus(), CrmAuditStatusEnum.DRAFT.getStatus())
+ && ObjUtil.notEqual(refund.getAuditStatus(), CrmAuditStatusEnum.REJECT.getStatus())) {
+ throw exception(ErrorCodeConstants.CRM_REFUND_UPDATE_FAIL_NOT_EDITABLE);
}
- // 2. 鏇存柊閫�璐瑰崟
+ // 2. 鏇存柊閫�璐瑰崟锛涘鎵圭姸鎬佷笌瀹℃牳缁撴灉鍙兘鐢辨彁浜�/瀹℃牳鍙樻洿锛屾澶勬樉寮忔竻绌�
CrmRefundDO entity = BeanUtils.toBean(updateReqVO, CrmRefundDO.class);
- entity.setAuditStatus(null); // 瀹℃壒鐘舵�佸彧鑳界敱鎻愪氦/瀹℃牳鍙樻洿
- refundMapper.updateById(entity);
+ // 瀹℃牳鐩稿叧瀛楁鍙兘鐢辨彁浜�/瀹℃牳鍙樻洿
+ entity.setAuditStatus(null);
+ entity.setReviewerId(null);
+ entity.setReviewerName(null);
+ entity.setReviewTime(null);
+ entity.setReviewRemark(null);
+ refundMapper.update(entity, new LambdaUpdateWrapper<CrmRefundDO>()
+ .eq(CrmRefundDO::getId, entity.getId())
+ .set(CrmRefundDO::getAuditStatus, null)
+ .set(CrmRefundDO::getReviewerId, null)
+ .set(CrmRefundDO::getReviewerName, null)
+ .set(CrmRefundDO::getReviewTime, null)
+ .set(CrmRefundDO::getReviewRemark, null));
}
@Override
public void deleteRefund(Long id) {
- // 鏍¢獙瀛樺湪 + 瀹℃牳閫氳繃鐨勯��璐瑰崟涓嶅厑璁稿垹闄�
+ // 鏍¢獙瀛樺湪 + 鍙湁鑽夌銆佸鏍镐笉閫氳繃鍙互鍒犻櫎
CrmRefundDO refund = validateRefundExists(id);
- if (ObjUtil.equal(refund.getAuditStatus(), CrmAuditStatusEnum.APPROVE.getStatus())) {
- throw exception(ErrorCodeConstants.CRM_REFUND_DELETE_FAIL_APPROVE);
+ if (ObjUtil.notEqual(refund.getAuditStatus(), CrmAuditStatusEnum.DRAFT.getStatus())
+ && ObjUtil.notEqual(refund.getAuditStatus(), CrmAuditStatusEnum.REJECT.getStatus())) {
+ throw exception(ErrorCodeConstants.CRM_REFUND_DELETE_FAIL_NOT_EDITABLE);
}
refundMapper.deleteById(id);
}
@@ -129,7 +143,9 @@
approvalConfigApi.validateApprovalEnabledAndGetApprovers(REFUND_APPROVE_BIZ_TYPE);
// 3. 鐘舵�佺疆涓哄鎵逛腑锛屽苟娓呯┖涓婁竴杞鏍哥粨鏋滐紝閬垮厤娈嬬暀銆屽鏍镐笉閫氳繃銆嶇殑鍘熷洜
- refundMapper.submitAndResetAuditInfo(id, CrmAuditStatusEnum.PROCESS.getStatus());
+ if (refundMapper.submitAndResetAuditInfo(id, CrmAuditStatusEnum.PROCESS.getStatus()) != 1) {
+ throw exception(ErrorCodeConstants.CRM_REFUND_SUBMIT_FAIL_NOT_EDITABLE);
+ }
}
@Override
@@ -154,13 +170,17 @@
if (StrUtil.isBlank(reviewRemark)) {
throw exception(ErrorCodeConstants.CRM_REFUND_AUDIT_REJECT_REASON_REQUIRED);
}
- refundMapper.auditRefund(id, CrmAuditStatusEnum.REJECT.getStatus(),
- userId, getUserNickname(userId), reviewRemark);
+ if (refundMapper.auditRefund(id, CrmAuditStatusEnum.REJECT.getStatus(),
+ userId, getUserNickname(userId), reviewRemark) != 1) {
+ throw exception(ErrorCodeConstants.CRM_REFUND_AUDIT_FAIL_NOT_PROCESS);
+ }
return;
}
// 5. 瀹℃牳閫氳繃锛氳褰曞鏍镐汉涓庡鏍告剰瑙侊紝鐘舵�佺疆涓哄鏍搁�氳繃
- refundMapper.auditRefund(id, CrmAuditStatusEnum.APPROVE.getStatus(),
- userId, getUserNickname(userId), reviewRemark);
+ if (refundMapper.auditRefund(id, CrmAuditStatusEnum.APPROVE.getStatus(),
+ userId, getUserNickname(userId), reviewRemark) != 1) {
+ throw exception(ErrorCodeConstants.CRM_REFUND_AUDIT_FAIL_NOT_PROCESS);
+ }
}
private CrmRefundDO validateRefundExists(Long id) {
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/finance/ErpFinancePaymentMapper.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/finance/ErpFinancePaymentMapper.java
index 5f9f603..a126c2b 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/finance/ErpFinancePaymentMapper.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/finance/ErpFinancePaymentMapper.java
@@ -94,6 +94,7 @@
default int submitAndResetAuditInfo(Long id, Integer status) {
return update(null, new LambdaUpdateWrapper<ErpFinancePaymentDO>()
.eq(ErpFinancePaymentDO::getId, id)
+ .eq(ErpFinancePaymentDO::getStatus, ErpAuditStatus.PROCESS.getStatus())
.set(ErpFinancePaymentDO::getStatus, status)
.set(ErpFinancePaymentDO::getReviewerId, null)
.set(ErpFinancePaymentDO::getReviewerName, null)
@@ -108,6 +109,7 @@
String reviewerName, String reviewRemark) {
return update(null, new LambdaUpdateWrapper<ErpFinancePaymentDO>()
.eq(ErpFinancePaymentDO::getId, id)
+ .eq(ErpFinancePaymentDO::getStatus, ErpAuditStatus.APPROVING.getStatus())
.set(ErpFinancePaymentDO::getStatus, status)
.set(ErpFinancePaymentDO::getReviewerId, reviewerId)
.set(ErpFinancePaymentDO::getReviewerName, reviewerName)
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/purchase/ErpPurchaseOrderMapper.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/purchase/ErpPurchaseOrderMapper.java
index 00d4025..3399ab9 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/purchase/ErpPurchaseOrderMapper.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/purchase/ErpPurchaseOrderMapper.java
@@ -8,6 +8,7 @@
import cn.iocoder.yudao.module.erp.dal.dataobject.purchase.ErpPurchaseOrderDO;
import cn.iocoder.yudao.module.erp.dal.dataobject.purchase.ErpPurchaseOrderItemDO;
import cn.iocoder.yudao.module.erp.enums.ErpAuditStatus;
+import cn.iocoder.yudao.module.erp.enums.ErpPurchaseOrderStatusEnum;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import org.apache.ibatis.annotations.Mapper;
@@ -80,6 +81,8 @@
default int submitAndResetAuditInfo(Long id, Integer status) {
return update(null, new LambdaUpdateWrapper<ErpPurchaseOrderDO>()
.eq(ErpPurchaseOrderDO::getId, id)
+ .in(ErpPurchaseOrderDO::getStatus,
+ ErpPurchaseOrderStatusEnum.DRAFT.getStatus(), ErpPurchaseOrderStatusEnum.REJECT.getStatus())
.set(ErpPurchaseOrderDO::getStatus, status)
.set(ErpPurchaseOrderDO::getReviewerId, null)
.set(ErpPurchaseOrderDO::getReviewerName, null)
@@ -93,6 +96,7 @@
default int auditPurchaseOrder(Long id, Integer status, Long reviewerId, String reviewerName, String reviewRemark) {
return update(null, new LambdaUpdateWrapper<ErpPurchaseOrderDO>()
.eq(ErpPurchaseOrderDO::getId, id)
+ .eq(ErpPurchaseOrderDO::getStatus, ErpPurchaseOrderStatusEnum.PROCESS.getStatus())
.set(ErpPurchaseOrderDO::getStatus, status)
.set(ErpPurchaseOrderDO::getReviewerId, reviewerId)
.set(ErpPurchaseOrderDO::getReviewerName, reviewerName)
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/purchase/ErpPurchasePlanMapper.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/purchase/ErpPurchasePlanMapper.java
index 361f95f..e36788c 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/purchase/ErpPurchasePlanMapper.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/purchase/ErpPurchasePlanMapper.java
@@ -5,6 +5,7 @@
import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.plan.ErpPurchasePlanPageReqVO;
import cn.iocoder.yudao.module.erp.dal.dataobject.purchase.ErpPurchasePlanDO;
+import cn.iocoder.yudao.module.erp.enums.ErpPurchasePlanStatusEnum;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import org.apache.ibatis.annotations.Mapper;
@@ -53,6 +54,8 @@
default int submitAndResetAuditInfo(Long id, Integer status) {
return update(null, new LambdaUpdateWrapper<ErpPurchasePlanDO>()
.eq(ErpPurchasePlanDO::getId, id)
+ .in(ErpPurchasePlanDO::getStatus,
+ ErpPurchasePlanStatusEnum.DRAFT.getStatus(), ErpPurchasePlanStatusEnum.REJECT.getStatus())
.set(ErpPurchasePlanDO::getStatus, status)
.set(ErpPurchasePlanDO::getReviewerId, null)
.set(ErpPurchasePlanDO::getReviewerName, null)
@@ -76,6 +79,7 @@
String reviewerName, String reviewRemark) {
return update(null, new LambdaUpdateWrapper<ErpPurchasePlanDO>()
.eq(ErpPurchasePlanDO::getId, id)
+ .eq(ErpPurchasePlanDO::getStatus, ErpPurchasePlanStatusEnum.PROCESS.getStatus())
.set(ErpPurchasePlanDO::getStatus, status)
.set(ErpPurchasePlanDO::getReviewerId, reviewerId)
.set(ErpPurchasePlanDO::getReviewerName, reviewerName)
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/purchase/ErpPurchaseRequestMapper.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/purchase/ErpPurchaseRequestMapper.java
index d68ef85..b992157 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/purchase/ErpPurchaseRequestMapper.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/purchase/ErpPurchaseRequestMapper.java
@@ -5,6 +5,7 @@
import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.request.ErpPurchaseRequestPageReqVO;
import cn.iocoder.yudao.module.erp.dal.dataobject.purchase.ErpPurchaseRequestDO;
+import cn.iocoder.yudao.module.erp.enums.ErpPurchaseRequestStatusEnum;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import org.apache.ibatis.annotations.Mapper;
@@ -53,6 +54,8 @@
default int submitAndResetAuditInfo(Long id, Integer status) {
return update(null, new LambdaUpdateWrapper<ErpPurchaseRequestDO>()
.eq(ErpPurchaseRequestDO::getId, id)
+ .in(ErpPurchaseRequestDO::getStatus,
+ ErpPurchaseRequestStatusEnum.DRAFT.getStatus(), ErpPurchaseRequestStatusEnum.REJECT.getStatus())
.set(ErpPurchaseRequestDO::getStatus, status)
.set(ErpPurchaseRequestDO::getReviewerId, null)
.set(ErpPurchaseRequestDO::getReviewerName, null)
@@ -67,6 +70,7 @@
String reviewerName, String reviewRemark) {
return update(null, new LambdaUpdateWrapper<ErpPurchaseRequestDO>()
.eq(ErpPurchaseRequestDO::getId, id)
+ .eq(ErpPurchaseRequestDO::getStatus, ErpPurchaseRequestStatusEnum.PROCESS.getStatus())
.set(ErpPurchaseRequestDO::getStatus, status)
.set(ErpPurchaseRequestDO::getReviewerId, reviewerId)
.set(ErpPurchaseRequestDO::getReviewerName, reviewerName)
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/finance/ErpFinancePaymentServiceImpl.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/finance/ErpFinancePaymentServiceImpl.java
index 397afd9..016787d 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/finance/ErpFinancePaymentServiceImpl.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/finance/ErpFinancePaymentServiceImpl.java
@@ -177,7 +177,9 @@
// 2. 鏍¢獙瀹℃壒閰嶇疆宸插惎鐢ㄤ笖閰嶇疆浜嗘湁鏁堝鎵逛汉
approvalConfigApi.validateApprovalEnabledAndGetApprovers(FINANCE_PAYMENT_APPROVE_BIZ_TYPE);
// 3. 鐘舵�佺疆涓哄鎵逛腑锛屽苟娓呯┖涓婁竴杞鏍哥粨鏋�
- financePaymentMapper.submitAndResetAuditInfo(id, ErpAuditStatus.APPROVING.getStatus());
+ if (financePaymentMapper.submitAndResetAuditInfo(id, ErpAuditStatus.APPROVING.getStatus()) != 1) {
+ throw exception(FINANCE_PAYMENT_SUBMIT_FAIL_NOT_ALLOWED);
+ }
}
@Override
@@ -202,13 +204,17 @@
if (StrUtil.isBlank(reviewRemark)) {
throw exception(FINANCE_PAYMENT_AUDIT_REJECT_REASON_REQUIRED);
}
- financePaymentMapper.auditFinancePayment(id, ErpAuditStatus.PROCESS.getStatus(),
- userId, getUserNickname(userId), reviewRemark);
+ if (financePaymentMapper.auditFinancePayment(id, ErpAuditStatus.PROCESS.getStatus(),
+ userId, getUserNickname(userId), reviewRemark) != 1) {
+ throw exception(FINANCE_PAYMENT_AUDIT_FAIL_NOT_PROCESS);
+ }
return;
}
// 5. 瀹℃牳閫氳繃锛氳褰曞鏍镐汉涓庡鏍告剰瑙侊紝鐘舵�佺疆涓哄凡瀹℃牳
- financePaymentMapper.auditFinancePayment(id, ErpAuditStatus.APPROVE.getStatus(),
- userId, getUserNickname(userId), reviewRemark);
+ if (financePaymentMapper.auditFinancePayment(id, ErpAuditStatus.APPROVE.getStatus(),
+ userId, getUserNickname(userId), reviewRemark) != 1) {
+ throw exception(FINANCE_PAYMENT_AUDIT_FAIL_NOT_PROCESS);
+ }
}
/**
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseOrderServiceImpl.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseOrderServiceImpl.java
index 5fc5e15..cf9e52c 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseOrderServiceImpl.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseOrderServiceImpl.java
@@ -242,7 +242,9 @@
approvalConfigApi.validateApprovalEnabledAndGetApprovers(PURCHASE_ORDER_APPROVE_BIZ_TYPE);
// 3. 缃负瀹℃壒涓紝骞舵竻绌轰笂涓�杞鏍镐俊鎭紝閬垮厤椹冲洖鍘熷洜娈嬬暀
- purchaseOrderMapper.submitAndResetAuditInfo(id, ErpPurchaseOrderStatusEnum.PROCESS.getStatus());
+ if (purchaseOrderMapper.submitAndResetAuditInfo(id, ErpPurchaseOrderStatusEnum.PROCESS.getStatus()) != 1) {
+ throw exception(PURCHASE_ORDER_SUBMIT_FAIL_NOT_ALLOWED);
+ }
}
@Override
@@ -267,14 +269,18 @@
if (StrUtil.isBlank(reviewRemark)) {
throw exception(PURCHASE_ORDER_AUDIT_REJECT_REASON_REQUIRED);
}
- purchaseOrderMapper.auditPurchaseOrder(id, ErpPurchaseOrderStatusEnum.REJECT.getStatus(),
- userId, getUserNickname(userId), reviewRemark);
+ if (purchaseOrderMapper.auditPurchaseOrder(id, ErpPurchaseOrderStatusEnum.REJECT.getStatus(),
+ userId, getUserNickname(userId), reviewRemark) != 1) {
+ throw exception(PURCHASE_ORDER_AUDIT_FAIL_NOT_PROCESS);
+ }
return;
}
// 3. 瀹℃牳閫氳繃
- purchaseOrderMapper.auditPurchaseOrder(id, ErpPurchaseOrderStatusEnum.APPROVE.getStatus(),
- userId, getUserNickname(userId), reviewRemark);
+ if (purchaseOrderMapper.auditPurchaseOrder(id, ErpPurchaseOrderStatusEnum.APPROVE.getStatus(),
+ userId, getUserNickname(userId), reviewRemark) != 1) {
+ throw exception(PURCHASE_ORDER_AUDIT_FAIL_NOT_PROCESS);
+ }
}
/**
@@ -404,9 +410,13 @@
return;
}
purchaseOrders.forEach(purchaseOrder -> {
- if (ErpAuditStatus.APPROVE.getStatus().equals(purchaseOrder.getStatus())) {
+ if (ErpPurchaseOrderStatusEnum.APPROVE.getStatus().equals(purchaseOrder.getStatus())) {
throw exception(PURCHASE_ORDER_DELETE_FAIL_APPROVE, purchaseOrder.getNo());
}
+ // 瀹℃壒涓姝㈠垹闄わ紝闇�鍏堢敱瀹℃壒浜恒�屽鏍镐笉閫氳繃銆嶉��鍥�
+ if (ErpPurchaseOrderStatusEnum.PROCESS.getStatus().equals(purchaseOrder.getStatus())) {
+ throw exception(PURCHASE_ORDER_UPDATE_FAIL_PROCESS, purchaseOrder.getNo());
+ }
});
// 2. 閬嶅巻鍒犻櫎
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchasePlanServiceImpl.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchasePlanServiceImpl.java
index e1c8d95..d5d1a06 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchasePlanServiceImpl.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchasePlanServiceImpl.java
@@ -216,7 +216,9 @@
// 3. 鏍¢獙瀹℃壒閰嶇疆宸插惎鐢ㄤ笖閰嶇疆浜嗘湁鏁堝鎵逛汉锛堟湭閰嶇疆鏃舵姏鍑哄甫鏄庣‘鎻愮ず鐨勪笟鍔″紓甯革級
approvalConfigApi.validateApprovalEnabledAndGetApprovers(PURCHASE_PLAN_APPROVE_BIZ_TYPE);
// 4. 鐘舵�佺疆涓哄鎵逛腑锛屽苟娓呯┖涓婁竴杞鏍哥粨鏋滐紝閬垮厤娈嬬暀銆屽鏍镐笉閫氳繃銆嶇殑鍘熷洜
- purchasePlanMapper.submitAndResetAuditInfo(id, ErpPurchasePlanStatusEnum.PROCESS.getStatus());
+ if (purchasePlanMapper.submitAndResetAuditInfo(id, ErpPurchasePlanStatusEnum.PROCESS.getStatus()) != 1) {
+ throw exception(PURCHASE_PLAN_SUBMIT_FAIL_NOT_ALLOWED);
+ }
}
@Override
@@ -241,13 +243,17 @@
if (StrUtil.isBlank(reviewRemark)) {
throw exception(PURCHASE_PLAN_AUDIT_REJECT_REASON_REQUIRED);
}
- purchasePlanMapper.auditPurchasePlan(id, ErpPurchasePlanStatusEnum.REJECT.getStatus(),
- userId, getUserNickname(userId), reviewRemark);
+ if (purchasePlanMapper.auditPurchasePlan(id, ErpPurchasePlanStatusEnum.REJECT.getStatus(),
+ userId, getUserNickname(userId), reviewRemark) != 1) {
+ throw exception(PURCHASE_PLAN_AUDIT_FAIL_NOT_PROCESS);
+ }
return;
}
// 5. 瀹℃牳閫氳繃锛氳褰曞鏍镐汉涓庡鏍告剰瑙侊紝鐘舵�佺疆涓哄鏍搁�氳繃
- purchasePlanMapper.auditPurchasePlan(id, ErpPurchasePlanStatusEnum.APPROVE.getStatus(),
- userId, getUserNickname(userId), reviewRemark);
+ if (purchasePlanMapper.auditPurchasePlan(id, ErpPurchasePlanStatusEnum.APPROVE.getStatus(),
+ userId, getUserNickname(userId), reviewRemark) != 1) {
+ throw exception(PURCHASE_PLAN_AUDIT_FAIL_NOT_PROCESS);
+ }
// 6. 瀹℃牳閫氳繃涓旀湭鐢熸垚鐢宠锛岃嚜鍔ㄧ敓鎴愰噰璐敵璇�
if (!Boolean.TRUE.equals(plan.getGeneratedFlag())) {
try {
@@ -566,7 +572,8 @@
private ErpPurchasePlanDO validatePurchasePlanCanModify(Long id) {
ErpPurchasePlanDO plan = validatePurchasePlanExists(id);
- if (!ErpPurchasePlanStatusEnum.DRAFT.getStatus().equals(plan.getStatus())) {
+ if (!ErpPurchasePlanStatusEnum.DRAFT.getStatus().equals(plan.getStatus())
+ && !ErpPurchasePlanStatusEnum.REJECT.getStatus().equals(plan.getStatus())) {
throw exception(PURCHASE_PLAN_UPDATE_FAIL_NOT_DRAFT, plan.getNo());
}
return plan;
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseRequestServiceImpl.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseRequestServiceImpl.java
index 5a35ed0..a3b6619 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseRequestServiceImpl.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseRequestServiceImpl.java
@@ -22,7 +22,7 @@
import cn.iocoder.yudao.module.erp.dal.mysql.purchase.ErpPurchaseRequestMapper;
import cn.iocoder.yudao.module.erp.dal.mysql.purchase.ErpSupplierMapper;
import cn.iocoder.yudao.module.erp.dal.redis.no.ErpNoRedisDAO;
-import cn.iocoder.yudao.module.erp.enums.ErpAuditStatus;
+import cn.iocoder.yudao.module.erp.enums.ErpPurchaseOrderStatusEnum;
import cn.iocoder.yudao.module.erp.enums.ErpPurchaseRequestStatusEnum;
import cn.iocoder.yudao.module.mdm.api.item.MdmItemApi;
import cn.iocoder.yudao.module.mdm.api.item.dto.MdmItemRespDTO;
@@ -269,7 +269,9 @@
// 3. 鏍¢獙瀹℃壒閰嶇疆宸插惎鐢ㄤ笖閰嶇疆浜嗘湁鏁堝鎵逛汉
approvalConfigApi.validateApprovalEnabledAndGetApprovers(PURCHASE_REQUEST_APPROVE_BIZ_TYPE);
// 4. 鐘舵�佺疆涓哄鎵逛腑锛屽苟娓呯┖涓婁竴杞鏍哥粨鏋�
- purchaseRequestMapper.submitAndResetAuditInfo(id, ErpPurchaseRequestStatusEnum.PROCESS.getStatus());
+ if (purchaseRequestMapper.submitAndResetAuditInfo(id, ErpPurchaseRequestStatusEnum.PROCESS.getStatus()) != 1) {
+ throw exception(PURCHASE_REQUEST_SUBMIT_FAIL_NOT_ALLOWED);
+ }
}
@Override
@@ -294,13 +296,17 @@
if (StrUtil.isBlank(reviewRemark)) {
throw exception(PURCHASE_REQUEST_AUDIT_REJECT_REASON_REQUIRED);
}
- purchaseRequestMapper.auditPurchaseRequest(id, ErpPurchaseRequestStatusEnum.REJECT.getStatus(),
- userId, getUserNickname(userId), reviewRemark);
+ if (purchaseRequestMapper.auditPurchaseRequest(id, ErpPurchaseRequestStatusEnum.REJECT.getStatus(),
+ userId, getUserNickname(userId), reviewRemark) != 1) {
+ throw exception(PURCHASE_REQUEST_AUDIT_FAIL_NOT_PROCESS);
+ }
return;
}
// 5. 瀹℃牳閫氳繃锛氳褰曞鏍镐汉涓庡鏍告剰瑙�
- purchaseRequestMapper.auditPurchaseRequest(id, ErpPurchaseRequestStatusEnum.APPROVE.getStatus(),
- userId, getUserNickname(userId), reviewRemark);
+ if (purchaseRequestMapper.auditPurchaseRequest(id, ErpPurchaseRequestStatusEnum.APPROVE.getStatus(),
+ userId, getUserNickname(userId), reviewRemark) != 1) {
+ throw exception(PURCHASE_REQUEST_AUDIT_FAIL_NOT_PROCESS);
+ }
// 6. 瀹℃牳閫氳繃涓旀湁渚涘簲鍟嗐�佹湭鐢熸垚璁㈠崟鏃讹紝鑷姩鐢熸垚閲囪喘璁㈠崟
if (purchaseRequest.getSupplierId() != null && purchaseRequest.getOrderId() == null) {
try {
@@ -376,7 +382,8 @@
// 3. 鍒涘缓閲囪喘璁㈠崟
ErpPurchaseOrderDO purchaseOrder = new ErpPurchaseOrderDO();
purchaseOrder.setNo(orderNo);
- purchaseOrder.setStatus(ErpAuditStatus.APPROVE.getStatus()); // 閲囪喘璁㈠崟鐩存帴涓哄凡瀹℃牳鐘舵��
+ // 鑷姩鐢熸垚鐨勯噰璐鍗曚粛涓鸿崏绋匡紝蹇呴』璧拌鍗曡嚜韬殑鎻愪氦/瀹℃壒娴佺▼锛岄伩鍏嶇粫杩囧鎵�
+ purchaseOrder.setStatus(ErpPurchaseOrderStatusEnum.DRAFT.getStatus());
purchaseOrder.setSupplierId(purchaseRequest.getSupplierId());
purchaseOrder.setOrderTime(purchaseRequest.getRequestTime());
purchaseOrder.setTotalCount(purchaseRequest.getTotalCount());
@@ -410,9 +417,10 @@
});
purchaseOrderItemMapper.insertBatch(orderItems);
- // 5. 鏇存柊閲囪喘鐢宠鐨勮鍗曚俊鎭�
+ // 5. 鏇存柊閲囪喘鐢宠鐨勮鍗曚俊鎭紝骞跺洖鍐欐渶缁堜娇鐢ㄧ殑渚涘簲鍟�
purchaseRequestMapper.updateById(new ErpPurchaseRequestDO()
.setId(id)
+ .setSupplierId(purchaseRequest.getSupplierId())
.setOrderId(purchaseOrder.getId())
.setOrderNo(orderNo));
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/listener/ErpPurchasePlanStatusListener.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/listener/ErpPurchasePlanStatusListener.java
index b34e86d..610701e 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/listener/ErpPurchasePlanStatusListener.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/listener/ErpPurchasePlanStatusListener.java
@@ -4,16 +4,19 @@
import cn.iocoder.yudao.module.erp.service.purchase.ErpPurchasePlanService;
import jakarta.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Component;
/**
- * 閲囪喘璁″垝瀹℃壒鐘舵�佺洃鍚櫒
+ * 閲囪喘璁″垝瀹℃壒鐘舵�佺洃鍚櫒锛圠egacy锛屽凡鍋滅敤锛�
*
- * 鐩戝惉 BPM 娴佺▼瀹炰緥鐘舵�佸彉鏇翠簨浠讹紝鏇存柊閲囪喘璁″垝鐨勫鎵圭姸鎬�
+ * 閲囪喘璁″垝瀹℃壒宸叉敼涓恒�屽鎵归厤缃�嶈交閲忕骇鐘舵�佹満锛岀敱
+ * {@link ErpPurchasePlanService#submitPurchasePlan(Long)} / {@link ErpPurchasePlanService#auditPurchasePlan(Long, Boolean, String)}
+ * 鐩存帴椹卞姩鐘舵�侊紝涓嶅啀渚濊禆 BPM銆�
+ *
+ * 淇濈暀鏈被浠呬綔鍘嗗彶鍙傝�冿紱涓嶅啀娉ㄥ唽涓� Spring Bean锛岄伩鍏嶆棫鐨� BPM 娴佺▼瀹炰緥瑙﹀彂鏃�
+ * 涓庢柊瀹℃壒璺緞閲嶅鏇存柊/閲嶅鐢熸垚閲囪喘鐢宠銆�
*
* @author xiaoyi
*/
-@Component
@Slf4j
public class ErpPurchasePlanStatusListener extends cn.iocoder.yudao.module.bpm.api.event.BpmProcessInstanceStatusEventListener {
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 81b0664..6411fda 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
@@ -41,6 +41,7 @@
ErrorCode LEAVE_APPLICATION_DURATION_EXCEED = new ErrorCode(1_030_001_005, "璇峰亣鏃堕暱瓒呭嚭骞村亣浣欓");
ErrorCode LEAVE_APPLICATION_AUDIT_FAIL_NOT_PROCESS = new ErrorCode(1_030_001_006, "鍙湁瀹℃壒涓姸鎬佺殑璇峰亣鐢宠鎵嶈兘瀹℃牳");
ErrorCode LEAVE_APPLICATION_AUDIT_REJECT_REASON_REQUIRED = new ErrorCode(1_030_001_007, "瀹℃牳涓嶉�氳繃鏃跺繀椤诲~鍐欎笉閫氳繃鍘熷洜");
+ ErrorCode LEAVE_APPLICATION_APPLICANT_NOT_EXISTS = new ErrorCode(1_030_001_008, "璇峰亣鐢宠浜轰笉瀛樺湪");
// ========== 璋冨矖鐢宠 1-030-002-000 ==========
ErrorCode TRANSFER_APPLICATION_NOT_EXISTS = new ErrorCode(1_030_002_000, "璋冨矖鐢宠涓嶅瓨鍦�");
@@ -93,6 +94,7 @@
ErrorCode ATTENDANCE_RULE_IMPORT_LIST_IS_EMPTY = new ErrorCode(1_030_004_023, "瀵煎叆鑰冨嫟瑙勫垯鏁版嵁涓嶈兘涓虹┖");
ErrorCode ATTENDANCE_RULE_EXISTS = new ErrorCode(1_030_004_024, "宸插瓨鍦ㄨ�冨嫟瑙勫垯銆恵}銆戯紝涓旀湭寮�鍚鐩栵紒");
ErrorCode ATTENDANCE_RULE_DEPT_NOT_EXISTS = new ErrorCode(1_030_004_025, "閮ㄩ棬銆恵}銆戜笉瀛樺湪");
+ ErrorCode ATTENDANCE_EXCEPTION_TIME_REQUIRED = new ErrorCode(1_030_004_026, "琛ュ崱鐢宠蹇呴』濉啓琛ュ崱鏃堕棿");
// ========== 缁╂晥鑰冩牳 1-030-008-000 ==========
ErrorCode PERFORMANCE_APPRAISE_NOT_EXISTS = new ErrorCode(1_030_008_000, "缁╂晥鑰冩牳鏂规涓嶅瓨鍦�");
@@ -108,6 +110,7 @@
ErrorCode PERFORMANCE_APPRAISE_SCOPE_TEAM_EMPTY = new ErrorCode(1_030_008_010, "鎸囧畾鐝粍涓虹┖锛屾棤娉曠敓鎴愯鑰冩牳浜�");
ErrorCode PERFORMANCE_APPRAISE_IMPORT_LIST_IS_EMPTY = new ErrorCode(1_030_008_011, "瀵煎叆缁╂晥鑰冩牳鏂规鏁版嵁涓嶈兘涓虹┖");
ErrorCode PERFORMANCE_APPRAISE_EXISTS = new ErrorCode(1_030_008_012, "宸插瓨鍦ㄧ哗鏁堣�冩牳鏂规銆恵}銆戯紝涓旀湭寮�鍚鐩栵紒");
+ ErrorCode PERFORMANCE_APPRAISE_ITEM_WEIGHT_INVALID = new ErrorCode(1_030_008_013, "鑰冩牳鎸囨爣鏉冮噸鍚堣蹇呴』澶т簬 0");
// ========== 钖叕绠$悊 1-030-005-000 ==========
ErrorCode SALARY_STRUCTURE_NOT_EXISTS = new ErrorCode(1_030_005_000, "钖叕缁撴瀯涓嶅瓨鍦�");
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/vo/HrmAttendanceExceptionSaveReqVO.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/vo/HrmAttendanceExceptionSaveReqVO.java
index 64dd7d0..8cb3df2 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/vo/HrmAttendanceExceptionSaveReqVO.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/vo/HrmAttendanceExceptionSaveReqVO.java
@@ -24,7 +24,8 @@
@NotNull(message = "寮傚父鏃ユ湡涓嶈兘涓虹┖")
private LocalDate exceptionDate;
- @Schema(description = "寮傚父鏃堕棿鐐�", example = "2024-01-15 09:00:00")
+ @Schema(description = "寮傚父鏃堕棿鐐�", requiredMode = Schema.RequiredMode.REQUIRED, example = "2024-01-15 09:00:00")
+ @NotNull(message = "寮傚父鏃堕棿鐐逛笉鑳戒负绌�")
private LocalDateTime exceptionTime;
@Schema(description = "鐢宠鍘熷洜", requiredMode = Schema.RequiredMode.REQUIRED, example = "蹇樿鎵撳崱")
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/mysql/approval/HrmLeaveApplicationMapper.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/mysql/approval/HrmLeaveApplicationMapper.java
index 63520f4..a63f963 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/mysql/approval/HrmLeaveApplicationMapper.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/mysql/approval/HrmLeaveApplicationMapper.java
@@ -48,6 +48,8 @@
default int submitAndResetAuditInfo(Long id, Integer status) {
return update(null, new LambdaUpdateWrapper<HrmLeaveApplicationDO>()
.eq(HrmLeaveApplicationDO::getId, id)
+ .in(HrmLeaveApplicationDO::getStatus,
+ HrmAuditStatusEnum.DRAFT.getStatus(), HrmAuditStatusEnum.REJECT.getStatus())
.set(HrmLeaveApplicationDO::getStatus, status)
.set(HrmLeaveApplicationDO::getReviewerId, null)
.set(HrmLeaveApplicationDO::getReviewerName, null)
@@ -71,6 +73,7 @@
String reviewerName, String reviewRemark) {
return update(null, new LambdaUpdateWrapper<HrmLeaveApplicationDO>()
.eq(HrmLeaveApplicationDO::getId, id)
+ .eq(HrmLeaveApplicationDO::getStatus, HrmAuditStatusEnum.PROCESS.getStatus())
.set(HrmLeaveApplicationDO::getStatus, status)
.set(HrmLeaveApplicationDO::getReviewerId, reviewerId)
.set(HrmLeaveApplicationDO::getReviewerName, reviewerName)
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/mysql/approval/HrmRegularizeApplicationMapper.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/mysql/approval/HrmRegularizeApplicationMapper.java
index 08f6f4c..1e1750d 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/mysql/approval/HrmRegularizeApplicationMapper.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/mysql/approval/HrmRegularizeApplicationMapper.java
@@ -5,6 +5,7 @@
import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
import cn.iocoder.yudao.module.hrm.controller.admin.approval.vo.HrmRegularizeApplicationPageReqVO;
import cn.iocoder.yudao.module.hrm.dal.dataobject.approval.HrmRegularizeApplicationDO;
+import cn.iocoder.yudao.module.hrm.enums.HrmAuditStatusEnum;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import org.apache.ibatis.annotations.Mapper;
@@ -46,6 +47,8 @@
default int submitAndResetAuditInfo(Long id, Integer status) {
return update(null, new LambdaUpdateWrapper<HrmRegularizeApplicationDO>()
.eq(HrmRegularizeApplicationDO::getId, id)
+ .in(HrmRegularizeApplicationDO::getStatus,
+ HrmAuditStatusEnum.DRAFT.getStatus(), HrmAuditStatusEnum.REJECT.getStatus())
.set(HrmRegularizeApplicationDO::getStatus, status)
.set(HrmRegularizeApplicationDO::getReviewerId, null)
.set(HrmRegularizeApplicationDO::getReviewerName, null)
@@ -69,6 +72,7 @@
String reviewerName, String reviewRemark) {
return update(null, new LambdaUpdateWrapper<HrmRegularizeApplicationDO>()
.eq(HrmRegularizeApplicationDO::getId, id)
+ .eq(HrmRegularizeApplicationDO::getStatus, HrmAuditStatusEnum.PROCESS.getStatus())
.set(HrmRegularizeApplicationDO::getStatus, status)
.set(HrmRegularizeApplicationDO::getReviewerId, reviewerId)
.set(HrmRegularizeApplicationDO::getReviewerName, reviewerName)
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/mysql/approval/HrmResignationApplicationMapper.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/mysql/approval/HrmResignationApplicationMapper.java
index 80a6ce0..e3e9117 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/mysql/approval/HrmResignationApplicationMapper.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/mysql/approval/HrmResignationApplicationMapper.java
@@ -5,6 +5,7 @@
import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
import cn.iocoder.yudao.module.hrm.controller.admin.approval.vo.HrmResignationApplicationPageReqVO;
import cn.iocoder.yudao.module.hrm.dal.dataobject.approval.HrmResignationApplicationDO;
+import cn.iocoder.yudao.module.hrm.enums.HrmAuditStatusEnum;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import org.apache.ibatis.annotations.Mapper;
@@ -46,6 +47,8 @@
default int submitAndResetAuditInfo(Long id, Integer status) {
return update(null, new LambdaUpdateWrapper<HrmResignationApplicationDO>()
.eq(HrmResignationApplicationDO::getId, id)
+ .in(HrmResignationApplicationDO::getStatus,
+ HrmAuditStatusEnum.DRAFT.getStatus(), HrmAuditStatusEnum.REJECT.getStatus())
.set(HrmResignationApplicationDO::getStatus, status)
.set(HrmResignationApplicationDO::getReviewerId, null)
.set(HrmResignationApplicationDO::getReviewerName, null)
@@ -69,6 +72,7 @@
String reviewerName, String reviewRemark) {
return update(null, new LambdaUpdateWrapper<HrmResignationApplicationDO>()
.eq(HrmResignationApplicationDO::getId, id)
+ .eq(HrmResignationApplicationDO::getStatus, HrmAuditStatusEnum.PROCESS.getStatus())
.set(HrmResignationApplicationDO::getStatus, status)
.set(HrmResignationApplicationDO::getReviewerId, reviewerId)
.set(HrmResignationApplicationDO::getReviewerName, reviewerName)
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/mysql/approval/HrmTransferApplicationMapper.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/mysql/approval/HrmTransferApplicationMapper.java
index 97c1a20..5c66ee3 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/mysql/approval/HrmTransferApplicationMapper.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/mysql/approval/HrmTransferApplicationMapper.java
@@ -5,6 +5,7 @@
import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
import cn.iocoder.yudao.module.hrm.controller.admin.approval.vo.HrmTransferApplicationPageReqVO;
import cn.iocoder.yudao.module.hrm.dal.dataobject.approval.HrmTransferApplicationDO;
+import cn.iocoder.yudao.module.hrm.enums.HrmAuditStatusEnum;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import org.apache.ibatis.annotations.Mapper;
@@ -47,6 +48,8 @@
default int submitAndResetAuditInfo(Long id, Integer status) {
return update(null, new LambdaUpdateWrapper<HrmTransferApplicationDO>()
.eq(HrmTransferApplicationDO::getId, id)
+ .in(HrmTransferApplicationDO::getStatus,
+ HrmAuditStatusEnum.DRAFT.getStatus(), HrmAuditStatusEnum.REJECT.getStatus())
.set(HrmTransferApplicationDO::getStatus, status)
.set(HrmTransferApplicationDO::getReviewerId, null)
.set(HrmTransferApplicationDO::getReviewerName, null)
@@ -70,12 +73,15 @@
String reviewerName, String reviewRemark) {
return update(null, new LambdaUpdateWrapper<HrmTransferApplicationDO>()
.eq(HrmTransferApplicationDO::getId, id)
+ .eq(HrmTransferApplicationDO::getStatus, HrmAuditStatusEnum.PROCESS.getStatus())
.set(HrmTransferApplicationDO::getStatus, status)
.set(HrmTransferApplicationDO::getReviewerId, reviewerId)
.set(HrmTransferApplicationDO::getReviewerName, reviewerName)
.set(HrmTransferApplicationDO::getReviewTime, LocalDateTime.now())
.set(HrmTransferApplicationDO::getReviewRemark, reviewRemark)
- .set(HrmTransferApplicationDO::getApproveTime, LocalDateTime.now()));
+ // 浠呭鏍搁�氳繃鏃跺啓鍏ラ�氳繃鏃堕棿锛岄┏鍥炰笉鍐�
+ .set(HrmAuditStatusEnum.APPROVE.getStatus().equals(status),
+ HrmTransferApplicationDO::getApproveTime, LocalDateTime.now()));
}
}
\ No newline at end of file
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/mysql/attendance/HrmAttendanceExceptionMapper.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/mysql/attendance/HrmAttendanceExceptionMapper.java
index fc1afba..01b571b 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/mysql/attendance/HrmAttendanceExceptionMapper.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/mysql/attendance/HrmAttendanceExceptionMapper.java
@@ -5,6 +5,7 @@
import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
import cn.iocoder.yudao.module.hrm.controller.admin.attendance.vo.HrmAttendanceExceptionPageReqVO;
import cn.iocoder.yudao.module.hrm.dal.dataobject.attendance.HrmAttendanceExceptionDO;
+import cn.iocoder.yudao.module.hrm.enums.HrmAuditStatusEnum;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import org.apache.ibatis.annotations.Mapper;
@@ -45,6 +46,8 @@
default int submitAndResetAuditInfo(Long id, Integer status) {
return update(null, new LambdaUpdateWrapper<HrmAttendanceExceptionDO>()
.eq(HrmAttendanceExceptionDO::getId, id)
+ .in(HrmAttendanceExceptionDO::getStatus,
+ HrmAuditStatusEnum.DRAFT.getStatus(), HrmAuditStatusEnum.REJECT.getStatus())
.set(HrmAttendanceExceptionDO::getStatus, status)
.set(HrmAttendanceExceptionDO::getReviewerId, null)
.set(HrmAttendanceExceptionDO::getReviewerName, null)
@@ -68,12 +71,15 @@
String reviewerName, String reviewRemark) {
return update(null, new LambdaUpdateWrapper<HrmAttendanceExceptionDO>()
.eq(HrmAttendanceExceptionDO::getId, id)
+ .eq(HrmAttendanceExceptionDO::getStatus, HrmAuditStatusEnum.PROCESS.getStatus())
.set(HrmAttendanceExceptionDO::getStatus, status)
.set(HrmAttendanceExceptionDO::getReviewerId, reviewerId)
.set(HrmAttendanceExceptionDO::getReviewerName, reviewerName)
.set(HrmAttendanceExceptionDO::getReviewTime, LocalDateTime.now())
.set(HrmAttendanceExceptionDO::getReviewRemark, reviewRemark)
- .set(HrmAttendanceExceptionDO::getApproveTime, LocalDateTime.now()));
+ // 浠呭鏍搁�氳繃鏃跺啓鍏ラ�氳繃鏃堕棿锛岄┏鍥炰笉鍐�
+ .set(HrmAuditStatusEnum.APPROVE.getStatus().equals(status),
+ HrmAttendanceExceptionDO::getApproveTime, LocalDateTime.now()));
}
}
\ No newline at end of file
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/mysql/performanceappraise/HrmPerformanceAppraiseMapper.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/mysql/performanceappraise/HrmPerformanceAppraiseMapper.java
index 78b3d75..c1d6981 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/mysql/performanceappraise/HrmPerformanceAppraiseMapper.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/mysql/performanceappraise/HrmPerformanceAppraiseMapper.java
@@ -5,6 +5,7 @@
import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
import cn.iocoder.yudao.module.hrm.controller.admin.performanceappraise.vo.HrmPerformanceAppraisePageReqVO;
import cn.iocoder.yudao.module.hrm.dal.dataobject.performanceappraise.HrmPerformanceAppraiseDO;
+import cn.iocoder.yudao.module.hrm.enums.HrmAuditStatusEnum;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import org.apache.ibatis.annotations.Mapper;
@@ -37,6 +38,8 @@
default int submitAndResetAuditInfo(Long id, Integer auditStatus) {
return update(null, new LambdaUpdateWrapper<HrmPerformanceAppraiseDO>()
.eq(HrmPerformanceAppraiseDO::getId, id)
+ .in(HrmPerformanceAppraiseDO::getAuditStatus,
+ HrmAuditStatusEnum.DRAFT.getStatus(), HrmAuditStatusEnum.REJECT.getStatus())
.set(HrmPerformanceAppraiseDO::getAuditStatus, auditStatus)
.set(HrmPerformanceAppraiseDO::getReviewerId, null)
.set(HrmPerformanceAppraiseDO::getReviewerName, null)
@@ -61,6 +64,7 @@
String reviewerName, String reviewRemark) {
return update(null, new LambdaUpdateWrapper<HrmPerformanceAppraiseDO>()
.eq(HrmPerformanceAppraiseDO::getId, id)
+ .eq(HrmPerformanceAppraiseDO::getAuditStatus, HrmAuditStatusEnum.PROCESS.getStatus())
.set(HrmPerformanceAppraiseDO::getAuditStatus, auditStatus)
.set(HrmPerformanceAppraiseDO::getStatus, status)
.set(HrmPerformanceAppraiseDO::getReviewerId, reviewerId)
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/approval/HrmLeaveApplicationServiceImpl.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/approval/HrmLeaveApplicationServiceImpl.java
index 47ffce1..17ba3a7 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/approval/HrmLeaveApplicationServiceImpl.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/approval/HrmLeaveApplicationServiceImpl.java
@@ -77,7 +77,7 @@
}
AdminUserRespDTO user = adminUserApi.getUser(userId);
if (user == null) {
- userId = getCurrentUserId();
+ throw exception(LEAVE_APPLICATION_APPLICANT_NOT_EXISTS);
}
// 3. 鎻掑叆
HrmLeaveApplicationDO application = BeanUtils.toBean(createReqVO, HrmLeaveApplicationDO.class);
@@ -108,9 +108,9 @@
public void updateLeaveApplication(HrmLeaveApplicationSaveReqVO updateReqVO) {
// 鏍¢獙瀛樺湪
HrmLeaveApplicationDO application = validateLeaveApplicationExists(updateReqVO.getId());
- // 鏍¢獙鐘舵�佷负鑽夌鎴栧鎵逛腑
+ // 鏍¢獙鐘舵�佷负鑽夌鎴栧鏍镐笉閫氳繃锛堝鎵逛腑绂佹淇敼锛�
if (!Objects.equals(application.getStatus(), HrmAuditStatusEnum.DRAFT.getStatus())
- && !Objects.equals(application.getStatus(), HrmAuditStatusEnum.PROCESS.getStatus())) {
+ && !Objects.equals(application.getStatus(), HrmAuditStatusEnum.REJECT.getStatus())) {
throw exception(LEAVE_APPLICATION_UPDATE_FAIL_NOT_DRAFT);
}
// 鏇存柊
@@ -222,7 +222,9 @@
approvalConfigApi.validateApprovalEnabledAndGetApprovers(LEAVE_APPROVE_BIZ_TYPE);
// 3. 鐘舵�佺疆涓哄鎵逛腑锛屽苟娓呯┖涓婁竴杞鏍哥粨鏋滐紝閬垮厤娈嬬暀銆屽鏍镐笉閫氳繃銆嶇殑鍘熷洜
- leaveApplicationMapper.submitAndResetAuditInfo(id, HrmAuditStatusEnum.PROCESS.getStatus());
+ if (leaveApplicationMapper.submitAndResetAuditInfo(id, HrmAuditStatusEnum.PROCESS.getStatus()) != 1) {
+ throw exception(LEAVE_APPLICATION_SUBMIT_FAIL_NOT_EDITABLE);
+ }
}
@Override
@@ -247,13 +249,17 @@
if (StrUtil.isBlank(reviewRemark)) {
throw exception(LEAVE_APPLICATION_AUDIT_REJECT_REASON_REQUIRED);
}
- leaveApplicationMapper.auditLeaveApplication(id, HrmAuditStatusEnum.REJECT.getStatus(),
- userId, getUserNickname(userId), reviewRemark);
+ if (leaveApplicationMapper.auditLeaveApplication(id, HrmAuditStatusEnum.REJECT.getStatus(),
+ userId, getUserNickname(userId), reviewRemark) != 1) {
+ throw exception(LEAVE_APPLICATION_AUDIT_FAIL_NOT_PROCESS);
+ }
return;
}
// 5. 瀹℃牳閫氳繃锛氳褰曞鏍镐汉涓庡鏍告剰瑙侊紝鐘舵�佺疆涓哄鏍搁�氳繃
- leaveApplicationMapper.auditLeaveApplication(id, HrmAuditStatusEnum.APPROVE.getStatus(),
- userId, getUserNickname(userId), reviewRemark);
+ if (leaveApplicationMapper.auditLeaveApplication(id, HrmAuditStatusEnum.APPROVE.getStatus(),
+ userId, getUserNickname(userId), reviewRemark) != 1) {
+ throw exception(LEAVE_APPLICATION_AUDIT_FAIL_NOT_PROCESS);
+ }
}
/**
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/approval/HrmRegularizeApplicationServiceImpl.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/approval/HrmRegularizeApplicationServiceImpl.java
index 2a90f0e..1eba90c 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/approval/HrmRegularizeApplicationServiceImpl.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/approval/HrmRegularizeApplicationServiceImpl.java
@@ -124,7 +124,8 @@
@Override
public void updateRegularizeApplication(HrmRegularizeApplicationSaveReqVO updateReqVO) {
HrmRegularizeApplicationDO application = validateRegularizeApplicationExists(updateReqVO.getId());
- if (!Objects.equals(application.getStatus(), HrmAuditStatusEnum.DRAFT.getStatus())) {
+ if (!Objects.equals(application.getStatus(), HrmAuditStatusEnum.DRAFT.getStatus())
+ && !Objects.equals(application.getStatus(), HrmAuditStatusEnum.REJECT.getStatus())) {
throw exception(REGULARIZE_APPLICATION_UPDATE_FAIL_NOT_DRAFT);
}
HrmRegularizeApplicationDO updateObj = BeanUtils.toBean(updateReqVO, HrmRegularizeApplicationDO.class);
@@ -134,7 +135,8 @@
@Override
public void deleteRegularizeApplication(Long id) {
HrmRegularizeApplicationDO application = validateRegularizeApplicationExists(id);
- if (!Objects.equals(application.getStatus(), HrmAuditStatusEnum.DRAFT.getStatus())) {
+ if (!Objects.equals(application.getStatus(), HrmAuditStatusEnum.DRAFT.getStatus())
+ && !Objects.equals(application.getStatus(), HrmAuditStatusEnum.REJECT.getStatus())) {
throw exception(REGULARIZE_APPLICATION_UPDATE_FAIL_NOT_DRAFT);
}
regularizeApplicationMapper.deleteById(id);
@@ -241,7 +243,9 @@
approvalConfigApi.validateApprovalEnabledAndGetApprovers(REGULARIZE_APPROVE_BIZ_TYPE);
// 3. 鐘舵�佺疆涓哄鎵逛腑锛屽苟娓呯┖涓婁竴杞鏍哥粨鏋滐紝閬垮厤娈嬬暀銆屽鏍镐笉閫氳繃銆嶇殑鍘熷洜
- regularizeApplicationMapper.submitAndResetAuditInfo(id, HrmAuditStatusEnum.PROCESS.getStatus());
+ if (regularizeApplicationMapper.submitAndResetAuditInfo(id, HrmAuditStatusEnum.PROCESS.getStatus()) != 1) {
+ throw exception(REGULARIZE_APPLICATION_SUBMIT_FAIL_NOT_EDITABLE);
+ }
}
@Override
@@ -266,13 +270,17 @@
if (StrUtil.isBlank(reviewRemark)) {
throw exception(REGULARIZE_APPLICATION_AUDIT_REJECT_REASON_REQUIRED);
}
- regularizeApplicationMapper.auditRegularizeApplication(id, HrmAuditStatusEnum.REJECT.getStatus(),
- userId, getUserNickname(userId), reviewRemark);
+ if (regularizeApplicationMapper.auditRegularizeApplication(id, HrmAuditStatusEnum.REJECT.getStatus(),
+ userId, getUserNickname(userId), reviewRemark) != 1) {
+ throw exception(REGULARIZE_APPLICATION_AUDIT_FAIL_NOT_PROCESS);
+ }
return;
}
// 5. 瀹℃牳閫氳繃锛氳褰曞鏍镐汉涓庡鏍告剰瑙侊紝鐘舵�佺疆涓哄鏍搁�氳繃
- regularizeApplicationMapper.auditRegularizeApplication(id, HrmAuditStatusEnum.APPROVE.getStatus(),
- userId, getUserNickname(userId), reviewRemark);
+ if (regularizeApplicationMapper.auditRegularizeApplication(id, HrmAuditStatusEnum.APPROVE.getStatus(),
+ userId, getUserNickname(userId), reviewRemark) != 1) {
+ throw exception(REGULARIZE_APPLICATION_AUDIT_FAIL_NOT_PROCESS);
+ }
// 6. 瀹℃牳閫氳繃鍚庣疆涓氬姟閫昏緫锛氬洖鍐欏憳宸ヤ富妗o紙鐘舵��=鍦ㄨ亴锛岀敤宸ユ�ц川=姝e紡锛岃浆姝f棩鏈� = 鎷熻浆姝f棩鏈熸垨褰撳ぉ锛�
writeBackEmployee(application);
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/approval/HrmResignationApplicationServiceImpl.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/approval/HrmResignationApplicationServiceImpl.java
index f10205b..7b7a476 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/approval/HrmResignationApplicationServiceImpl.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/approval/HrmResignationApplicationServiceImpl.java
@@ -131,7 +131,8 @@
@Override
public void updateResignationApplication(HrmResignationApplicationSaveReqVO updateReqVO) {
HrmResignationApplicationDO application = validateResignationApplicationExists(updateReqVO.getId());
- if (!Objects.equals(application.getStatus(), HrmAuditStatusEnum.DRAFT.getStatus())) {
+ if (!Objects.equals(application.getStatus(), HrmAuditStatusEnum.DRAFT.getStatus())
+ && !Objects.equals(application.getStatus(), HrmAuditStatusEnum.REJECT.getStatus())) {
throw exception(RESIGNATION_APPLICATION_UPDATE_FAIL_NOT_DRAFT);
}
HrmResignationApplicationDO updateObj = BeanUtils.toBean(updateReqVO, HrmResignationApplicationDO.class);
@@ -142,7 +143,8 @@
@Override
public void deleteResignationApplication(Long id) {
HrmResignationApplicationDO application = validateResignationApplicationExists(id);
- if (!Objects.equals(application.getStatus(), HrmAuditStatusEnum.DRAFT.getStatus())) {
+ if (!Objects.equals(application.getStatus(), HrmAuditStatusEnum.DRAFT.getStatus())
+ && !Objects.equals(application.getStatus(), HrmAuditStatusEnum.REJECT.getStatus())) {
throw exception(RESIGNATION_APPLICATION_UPDATE_FAIL_NOT_DRAFT);
}
storageAttachmentApi.deleteAttachmentsByRecord("hrm_resignation_application", id);
@@ -260,7 +262,9 @@
approvalConfigApi.validateApprovalEnabledAndGetApprovers(RESIGNATION_APPROVE_BIZ_TYPE);
// 3. 鐘舵�佺疆涓哄鎵逛腑锛屽苟娓呯┖涓婁竴杞鏍哥粨鏋滐紝閬垮厤娈嬬暀銆屽鏍镐笉閫氳繃銆嶇殑鍘熷洜
- resignationApplicationMapper.submitAndResetAuditInfo(id, HrmAuditStatusEnum.PROCESS.getStatus());
+ if (resignationApplicationMapper.submitAndResetAuditInfo(id, HrmAuditStatusEnum.PROCESS.getStatus()) != 1) {
+ throw exception(RESIGNATION_APPLICATION_SUBMIT_FAIL_NOT_EDITABLE);
+ }
}
@Override
@@ -285,13 +289,17 @@
if (StrUtil.isBlank(reviewRemark)) {
throw exception(RESIGNATION_APPLICATION_AUDIT_REJECT_REASON_REQUIRED);
}
- resignationApplicationMapper.auditResignationApplication(id, HrmAuditStatusEnum.REJECT.getStatus(),
- userId, getUserNickname(userId), reviewRemark);
+ if (resignationApplicationMapper.auditResignationApplication(id, HrmAuditStatusEnum.REJECT.getStatus(),
+ userId, getUserNickname(userId), reviewRemark) != 1) {
+ throw exception(RESIGNATION_APPLICATION_AUDIT_FAIL_NOT_PROCESS);
+ }
return;
}
// 5. 瀹℃牳閫氳繃锛氳褰曞鏍镐汉涓庡鏍告剰瑙侊紝鐘舵�佺疆涓哄鏍搁�氳繃
- resignationApplicationMapper.auditResignationApplication(id, HrmAuditStatusEnum.APPROVE.getStatus(),
- userId, getUserNickname(userId), reviewRemark);
+ if (resignationApplicationMapper.auditResignationApplication(id, HrmAuditStatusEnum.APPROVE.getStatus(),
+ userId, getUserNickname(userId), reviewRemark) != 1) {
+ throw exception(RESIGNATION_APPLICATION_AUDIT_FAIL_NOT_PROCESS);
+ }
// 6. 瀹℃牳閫氳繃鍚庣疆涓氬姟閫昏緫锛氬洖鍐欏憳宸ヤ富妗o紙鐘舵��=绂昏亴锛岀鑱屾棩鏈� = 瀹為檯绂昏亴鏃ユ湡鎴栭璁$鑱屾棩鏈燂級
writeBackEmployee(application);
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/approval/HrmTransferApplicationServiceImpl.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/approval/HrmTransferApplicationServiceImpl.java
index 0535199..b270b32 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/approval/HrmTransferApplicationServiceImpl.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/approval/HrmTransferApplicationServiceImpl.java
@@ -124,7 +124,7 @@
public void updateTransferApplication(HrmTransferApplicationSaveReqVO updateReqVO) {
HrmTransferApplicationDO application = validateTransferApplicationExists(updateReqVO.getId());
if (!Objects.equals(application.getStatus(), HrmAuditStatusEnum.DRAFT.getStatus())
- && !Objects.equals(application.getStatus(), HrmAuditStatusEnum.PROCESS.getStatus())) {
+ && !Objects.equals(application.getStatus(), HrmAuditStatusEnum.REJECT.getStatus())) {
throw exception(TRANSFER_APPLICATION_UPDATE_FAIL_NOT_DRAFT);
}
if (Objects.equals(updateReqVO.getTargetDeptId(), updateReqVO.getCurrentDeptId())) {
@@ -265,7 +265,9 @@
approvalConfigApi.validateApprovalEnabledAndGetApprovers(TRANSFER_APPROVE_BIZ_TYPE);
// 3. 鐘舵�佺疆涓哄鎵逛腑锛屽苟娓呯┖涓婁竴杞鏍哥粨鏋滐紝閬垮厤娈嬬暀銆屽鏍镐笉閫氳繃銆嶇殑鍘熷洜
- transferApplicationMapper.submitAndResetAuditInfo(id, HrmAuditStatusEnum.PROCESS.getStatus());
+ if (transferApplicationMapper.submitAndResetAuditInfo(id, HrmAuditStatusEnum.PROCESS.getStatus()) != 1) {
+ throw exception(TRANSFER_APPLICATION_SUBMIT_FAIL_NOT_EDITABLE);
+ }
}
@Override
@@ -290,13 +292,17 @@
if (StrUtil.isBlank(reviewRemark)) {
throw exception(TRANSFER_APPLICATION_AUDIT_REJECT_REASON_REQUIRED);
}
- transferApplicationMapper.auditTransferApplication(id, HrmAuditStatusEnum.REJECT.getStatus(),
- userId, getUserNickname(userId), reviewRemark);
+ if (transferApplicationMapper.auditTransferApplication(id, HrmAuditStatusEnum.REJECT.getStatus(),
+ userId, getUserNickname(userId), reviewRemark) != 1) {
+ throw exception(TRANSFER_APPLICATION_AUDIT_FAIL_NOT_PROCESS);
+ }
return;
}
// 5. 瀹℃牳閫氳繃锛氳褰曞鏍镐汉涓庡鏍告剰瑙侊紝鐘舵�佺疆涓哄鏍搁�氳繃
- transferApplicationMapper.auditTransferApplication(id, HrmAuditStatusEnum.APPROVE.getStatus(),
- userId, getUserNickname(userId), reviewRemark);
+ if (transferApplicationMapper.auditTransferApplication(id, HrmAuditStatusEnum.APPROVE.getStatus(),
+ userId, getUserNickname(userId), reviewRemark) != 1) {
+ throw exception(TRANSFER_APPLICATION_AUDIT_FAIL_NOT_PROCESS);
+ }
// 6. 瀹℃牳閫氳繃鍚庣疆涓氬姟閫昏緫锛氬洖鍐欏憳宸ヤ富妗o紙閮ㄩ棬 = 鐩爣閮ㄩ棬锛屽矖浣� = 鐩爣宀椾綅锛�
writeBackEmployee(application);
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/attendance/HrmAttendanceExceptionServiceImpl.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/attendance/HrmAttendanceExceptionServiceImpl.java
index e4579e9..8f59d69 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/attendance/HrmAttendanceExceptionServiceImpl.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/attendance/HrmAttendanceExceptionServiceImpl.java
@@ -84,7 +84,8 @@
@Override
public void updateAttendanceException(HrmAttendanceExceptionSaveReqVO updateReqVO) {
HrmAttendanceExceptionDO attendanceException = validateAttendanceExceptionExists(updateReqVO.getId());
- if (!HrmAuditStatusEnum.DRAFT.getStatus().equals(attendanceException.getStatus())) {
+ if (!HrmAuditStatusEnum.DRAFT.getStatus().equals(attendanceException.getStatus())
+ && !HrmAuditStatusEnum.REJECT.getStatus().equals(attendanceException.getStatus())) {
throw exception(ATTENDANCE_EXCEPTION_UPDATE_FAIL_NOT_DRAFT);
}
HrmAttendanceExceptionDO updateObj = BeanUtils.toBean(updateReqVO, HrmAttendanceExceptionDO.class);
@@ -95,7 +96,8 @@
@Override
public void deleteAttendanceException(Long id) {
HrmAttendanceExceptionDO attendanceException = validateAttendanceExceptionExists(id);
- if (!HrmAuditStatusEnum.DRAFT.getStatus().equals(attendanceException.getStatus())) {
+ if (!HrmAuditStatusEnum.DRAFT.getStatus().equals(attendanceException.getStatus())
+ && !HrmAuditStatusEnum.REJECT.getStatus().equals(attendanceException.getStatus())) {
throw exception(ATTENDANCE_EXCEPTION_DELETE_FAIL_NOT_DRAFT);
}
storageAttachmentApi.deleteAttachmentsByRecord("hrm_attendance_exception", id);
@@ -130,11 +132,19 @@
throw exception(ATTENDANCE_EXCEPTION_SUBMIT_FAIL_NOT_EDITABLE);
}
- // 2. 鏍¢獙瀹℃壒閰嶇疆宸插惎鐢ㄤ笖閰嶇疆浜嗘湁鏁堝鎵逛汉锛堟湭閰嶇疆鏃舵姏鍑哄甫鏄庣‘鎻愮ず鐨勪笟鍔″紓甯革級
+ // 2. 琛ュ崱绫诲瀷蹇呴』濉啓琛ュ崱鏃堕棿锛岄伩鍏嶅鏍搁�氳繃鍚庡洖濉�冨嫟璁板綍鏃跺嚭鐜扮┖鎸囬拡
+ if (HrmAttendanceExceptionTypeEnum.SUPPLEMENT.getType().equals(exception.getType())
+ && exception.getExceptionTime() == null) {
+ throw exception(ATTENDANCE_EXCEPTION_TIME_REQUIRED);
+ }
+
+ // 3. 鏍¢獙瀹℃壒閰嶇疆宸插惎鐢ㄤ笖閰嶇疆浜嗘湁鏁堝鎵逛汉锛堟湭閰嶇疆鏃舵姏鍑哄甫鏄庣‘鎻愮ず鐨勪笟鍔″紓甯革級
approvalConfigApi.validateApprovalEnabledAndGetApprovers(ATTENDANCE_APPROVE_BIZ_TYPE);
- // 3. 鐘舵�佺疆涓哄鎵逛腑锛屽苟娓呯┖涓婁竴杞鏍哥粨鏋滐紝閬垮厤娈嬬暀銆屽鏍镐笉閫氳繃銆嶇殑鍘熷洜
- attendanceExceptionMapper.submitAndResetAuditInfo(id, HrmAuditStatusEnum.PROCESS.getStatus());
+ // 4. 鐘舵�佺疆涓哄鎵逛腑锛屽苟娓呯┖涓婁竴杞鏍哥粨鏋滐紝閬垮厤娈嬬暀銆屽鏍镐笉閫氳繃銆嶇殑鍘熷洜
+ if (attendanceExceptionMapper.submitAndResetAuditInfo(id, HrmAuditStatusEnum.PROCESS.getStatus()) != 1) {
+ throw exception(ATTENDANCE_EXCEPTION_SUBMIT_FAIL_NOT_EDITABLE);
+ }
}
@Override
@@ -151,6 +161,11 @@
if (!HrmAuditStatusEnum.PROCESS.getStatus().equals(exception.getStatus())) {
throw exception(ATTENDANCE_EXCEPTION_AUDIT_FAIL_NOT_PROCESS);
}
+ // 2.1 琛ュ崱绫诲瀷蹇呴』濉啓琛ュ崱鏃堕棿锛岄伩鍏嶅鏍搁�氳繃鍚庡洖濉�冨嫟璁板綍鏃跺嚭鐜扮┖鎸囬拡
+ if (HrmAttendanceExceptionTypeEnum.SUPPLEMENT.getType().equals(exception.getType())
+ && exception.getExceptionTime() == null) {
+ throw exception(ATTENDANCE_EXCEPTION_TIME_REQUIRED);
+ }
// 3. 鏍¢獙褰撳墠鐧诲綍鐢ㄦ埛鏄涓氬姟绫诲瀷鐨勫鎵逛汉锛堟垨绛撅細浠讳竴浜哄潎鍙鏍革級
Long userId = getLoginUserId();
approvalConfigApi.validateApprover(ATTENDANCE_APPROVE_BIZ_TYPE, userId);
@@ -159,13 +174,17 @@
if (StrUtil.isBlank(reviewRemark)) {
throw exception(ATTENDANCE_EXCEPTION_AUDIT_REJECT_REASON_REQUIRED);
}
- attendanceExceptionMapper.auditAttendanceException(id, HrmAuditStatusEnum.REJECT.getStatus(),
- userId, getUserNickname(userId), reviewRemark);
+ if (attendanceExceptionMapper.auditAttendanceException(id, HrmAuditStatusEnum.REJECT.getStatus(),
+ userId, getUserNickname(userId), reviewRemark) != 1) {
+ throw exception(ATTENDANCE_EXCEPTION_AUDIT_FAIL_NOT_PROCESS);
+ }
return;
}
// 5. 瀹℃牳閫氳繃锛氳褰曞鏍镐汉涓庡鏍告剰瑙侊紝鐘舵�佺疆涓哄鏍搁�氳繃
- attendanceExceptionMapper.auditAttendanceException(id, HrmAuditStatusEnum.APPROVE.getStatus(),
- userId, getUserNickname(userId), reviewRemark);
+ if (attendanceExceptionMapper.auditAttendanceException(id, HrmAuditStatusEnum.APPROVE.getStatus(),
+ userId, getUserNickname(userId), reviewRemark) != 1) {
+ throw exception(ATTENDANCE_EXCEPTION_AUDIT_FAIL_NOT_PROCESS);
+ }
// 6. 瀹℃牳閫氳繃鍚庣疆涓氬姟閫昏緫锛氳ˉ鍗″洖濉笂涓嬬彮鏃堕棿 / 鍔犵彮鍥炲啓鍔犵彮鏃堕暱
if (HrmAttendanceExceptionTypeEnum.SUPPLEMENT.getType().equals(exception.getType())) {
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/attendance/HrmAttendanceRecordServiceImpl.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/attendance/HrmAttendanceRecordServiceImpl.java
index ea112f1..3780f24 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/attendance/HrmAttendanceRecordServiceImpl.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/attendance/HrmAttendanceRecordServiceImpl.java
@@ -20,6 +20,7 @@
import cn.iocoder.yudao.module.system.api.dept.DeptApi;
import cn.iocoder.yudao.module.system.api.dept.dto.DeptRespDTO;
import jakarta.annotation.Resource;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated;
@@ -43,6 +44,7 @@
*/
@Service
@Validated
+@Slf4j
public class HrmAttendanceRecordServiceImpl implements HrmAttendanceRecordService {
@Resource
@@ -483,6 +485,11 @@
}
LocalDate exceptionDate = exception.getExceptionDate();
LocalDateTime exceptionTime = exception.getExceptionTime();
+ // 琛ュ崱鏃堕棿缂哄け鏃舵棤娉曞洖濉�冨嫟璁板綍锛岃褰曟棩蹇楀苟璺宠繃锛岄伩鍏嶇┖鎸囬拡
+ if (exceptionTime == null) {
+ log.warn("[supplementClockIn] 琛ュ崱鐢宠({}) 琛ュ崱鏃堕棿涓虹┖锛岃烦杩囪�冨嫟璁板綍鍥炲~", exception.getId());
+ return;
+ }
Long userId = exception.getUserId();
HrmEmployeeDO employee = employeeService.getEmployee(userId);
HrmAttendanceRuleDO rule = employee == null ? null
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/performanceappraise/HrmPerformanceAppraiseServiceImpl.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/performanceappraise/HrmPerformanceAppraiseServiceImpl.java
index b609d73..fae8d5b 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/performanceappraise/HrmPerformanceAppraiseServiceImpl.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/performanceappraise/HrmPerformanceAppraiseServiceImpl.java
@@ -199,7 +199,9 @@
approvalConfigApi.validateApprovalEnabledAndGetApprovers(APPRAISE_APPROVE_BIZ_TYPE);
// 3. 瀹℃壒鐘舵�佺疆涓哄鎵逛腑锛屽苟娓呯┖涓婁竴杞鏍哥粨鏋滐紝閬垮厤娈嬬暀銆屽鏍镐笉閫氳繃銆嶇殑鍘熷洜
- appraiseMapper.submitAndResetAuditInfo(id, HrmAuditStatusEnum.PROCESS.getStatus());
+ if (appraiseMapper.submitAndResetAuditInfo(id, HrmAuditStatusEnum.PROCESS.getStatus()) != 1) {
+ throw exception(ErrorCodeConstants.PERFORMANCE_APPRAISE_SUBMIT_FAIL_NOT_EDITABLE);
+ }
}
@Override
@@ -225,14 +227,18 @@
throw exception(ErrorCodeConstants.PERFORMANCE_APPRAISE_AUDIT_REJECT_REASON_REQUIRED);
}
// 鏂规鐘舵�佷繚鎸佷笉鍙�
- appraiseMapper.auditAppraise(id, HrmAuditStatusEnum.REJECT.getStatus(), appraise.getStatus(),
- userId, getUserNickname(userId), reviewRemark);
+ if (appraiseMapper.auditAppraise(id, HrmAuditStatusEnum.REJECT.getStatus(), appraise.getStatus(),
+ userId, getUserNickname(userId), reviewRemark) != 1) {
+ throw exception(ErrorCodeConstants.PERFORMANCE_APPRAISE_AUDIT_FAIL_NOT_PROCESS);
+ }
return;
}
// 5. 瀹℃牳閫氳繃锛氳褰曞鏍镐汉涓庡鏍告剰瑙侊紝瀹℃壒鐘舵�佺疆涓哄鏍搁�氳繃
// 6. 瀹℃牳閫氳繃鍚庣疆涓氬姟閫昏緫锛氭柟妗堢姸鎬佹祦杞负銆屽凡鍙戝竷銆�
- appraiseMapper.auditAppraise(id, HrmAuditStatusEnum.APPROVE.getStatus(), STATUS_PUBLISHED,
- userId, getUserNickname(userId), reviewRemark);
+ if (appraiseMapper.auditAppraise(id, HrmAuditStatusEnum.APPROVE.getStatus(), STATUS_PUBLISHED,
+ userId, getUserNickname(userId), reviewRemark) != 1) {
+ throw exception(ErrorCodeConstants.PERFORMANCE_APPRAISE_AUDIT_FAIL_NOT_PROCESS);
+ }
}
/**
@@ -323,6 +329,10 @@
.setWeight(weight)
.setSelfScore(selfScore)
.setSuperiorScore(superiorScore));
+ }
+ // 鏉冮噸鍚堣涓� 0 鏃舵棤娉曡绠楀姞鏉冨緱鍒嗭紝閬垮厤闄ら浂
+ if (sumWeight.compareTo(BigDecimal.ZERO) <= 0) {
+ throw exception(ErrorCodeConstants.PERFORMANCE_APPRAISE_ITEM_WEIGHT_INVALID);
}
BigDecimal selfTotal = weightedSelf.divide(sumWeight, 1, RoundingMode.HALF_UP);
BigDecimal superiorTotal = weightedSuperior.divide(sumWeight, 1, RoundingMode.HALF_UP);
@@ -424,7 +434,9 @@
private HrmPerformanceAppraiseDO validateAppraiseCanModify(Long id) {
HrmPerformanceAppraiseDO appraise = validateAppraiseExists(id);
- if (ObjUtil.notEqual(appraise.getStatus(), STATUS_DRAFT)) {
+ // 浠ュ鎵圭姸鎬佷负鍑嗭細浠呰崏绋� / 瀹℃牳涓嶉�氳繃鍏佽淇敼锛屽鎵逛腑绂佹淇敼
+ if (ObjUtil.notEqual(appraise.getAuditStatus(), HrmAuditStatusEnum.DRAFT.getStatus())
+ && ObjUtil.notEqual(appraise.getAuditStatus(), HrmAuditStatusEnum.REJECT.getStatus())) {
throw exception(ErrorCodeConstants.PERFORMANCE_APPRAISE_UPDATE_FAIL_NOT_DRAFT);
}
return appraise;
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pd/processparamtemplate/vo/MesPdProcessParamTemplateSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pd/processparamtemplate/vo/MesPdProcessParamTemplateSaveReqVO.java
index b138a09..61d220c 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pd/processparamtemplate/vo/MesPdProcessParamTemplateSaveReqVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pd/processparamtemplate/vo/MesPdProcessParamTemplateSaveReqVO.java
@@ -16,6 +16,9 @@
@Schema(description = "缂栧彿", requiredMode = Schema.RequiredMode.NOT_REQUIRED, example = "1024")
private Long id;
+ @Schema(description = "妯℃澘缂栫爜锛堢暀绌哄垯鑷姩鐢熸垚锛�", example = "PPT000001")
+ private String templateCode;
+
@Schema(description = "妯℃澘鍚嶇О", requiredMode = Schema.RequiredMode.REQUIRED, example = "娉ㄥ宸ヨ壓鍙傛暟妯℃澘")
@NotBlank(message = "妯℃澘鍚嶇О涓嶈兘涓虹┖")
private String templateName;
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pd/techconfirm/vo/ProductTechConfirmSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pd/techconfirm/vo/ProductTechConfirmSaveReqVO.java
index 7c58938..66ec758 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pd/techconfirm/vo/ProductTechConfirmSaveReqVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pd/techconfirm/vo/ProductTechConfirmSaveReqVO.java
@@ -1,6 +1,7 @@
package cn.iocoder.yudao.module.mes.controller.admin.pd.techconfirm.vo;
import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotBlank;
import lombok.Data;
/**
@@ -26,6 +27,7 @@
private Long id;
@Schema(description = "纭鍑界紪鍙�", requiredMode = Schema.RequiredMode.REQUIRED, example = "TC20260801001")
+ @NotBlank(message = "纭鍑界紪鍙蜂笉鑳戒负绌�")
private String confirmNo;
@Schema(description = "瀹㈡埛ID锛堝叧鑱� crm_customer.id锛�", example = "2048")
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/ErrorCodeConstants.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/ErrorCodeConstants.java
index 8bd9847..d7a93f2 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/ErrorCodeConstants.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/ErrorCodeConstants.java
@@ -357,6 +357,8 @@
ErrorCode PRO_FEEDBACK_UNCHECK_QUANTITY_EXISTS = new ErrorCode(1_040_506_012, "褰撳墠鎶ュ伐鍗曟湭瀹屾垚妫�楠岋紙寰呮鏁伴噺锛歿}锛夛紝鏃犳硶鎵ц鎶ュ伐");
ErrorCode PRO_FEEDBACK_BACKFLUSH_BOM_REQUIRED = new ErrorCode(1_040_506_013, "褰撳墠宸ュ簭涓哄�掑啿宸ュ簭锛屼絾鏈厤缃瓸OM娑堣�楋紝鏃犳硶鎶ュ伐");
ErrorCode PRO_FEEDBACK_CANNOT_CREATE_WHEN_PAUSED = new ErrorCode(1_040_506_014, "鐢熶骇浠诲姟澶勪簬鍋滃伐鐘舵�侊紝鏃犳硶鎶ュ伐");
+ ErrorCode PRO_FEEDBACK_APPROVER_NOT_CONFIGURED = new ErrorCode(1_040_506_015, "鎶ュ伐鍗曟湭鎸囧畾瀹℃牳浜猴紝鏃犳硶瀹℃壒");
+ ErrorCode PRO_FEEDBACK_NOT_APPROVER = new ErrorCode(1_040_506_016, "鎮ㄤ笉鏄鎶ュ伐鍗曠殑鎸囧畾瀹℃牳浜猴紝鏃犳潈瀹℃壒");
// ========== MES 鐢熶骇绠$悊-鐢熶骇娴佽浆鍗★紙1-040-507-000锛� ==========
ErrorCode PRO_CARD_NOT_EXISTS = new ErrorCode(1_040_507_000, "鐢熶骇娴佽浆鍗′笉瀛樺湪");
@@ -729,6 +731,8 @@
ErrorCode WM_STOCK_TAKING_TASK_ALREADY_SUBMIT_APPROVAL = new ErrorCode(1_040_714_123, "鐩樼偣缁撴灉瀹℃壒宸叉彁浜わ紝璇峰嬁閲嶅鎻愪氦");
ErrorCode WM_STOCK_TAKING_TASK_RESULT_NOT_SUBMITTED = new ErrorCode(1_040_714_124, "鍙湁宸叉彁浜ょ粨鏋滃鎵圭殑鐩樼偣浠诲姟鎵嶈兘瀹℃牳");
ErrorCode WM_STOCK_TAKING_TASK_REJECT_REASON_REQUIRED = new ErrorCode(1_040_714_125, "瀹℃牳涓嶉�氳繃鏃跺繀椤诲~鍐欎笉閫氳繃鍘熷洜");
+ ErrorCode WM_STOCK_TAKING_TASK_RESULT_APPROVAL_PENDING = new ErrorCode(1_040_714_126, "鐩樼偣缁撴灉瀹℃壒宸叉彁浜わ紝瀹℃牳瀹屾垚鍓嶄笉鍏佽淇敼鐩樼偣缁撴灉");
+ ErrorCode WM_STOCK_TAKING_TASK_LINE_NOT_MATCH = new ErrorCode(1_040_714_127, "鐩樼偣浠诲姟琛屼笉灞炰簬鎸囧畾鐨勭洏鐐逛换鍔�");
// ========== MES 浠撳簱绠$悊-閿�鍞嚭搴撳崟锛�1-040-714-000锛� ==========
ErrorCode WM_PRODUCT_SALES_NOT_EXISTS = new ErrorCode(1_040_714_000, "閿�鍞嚭搴撳崟涓嶅瓨鍦�");
@@ -774,6 +778,7 @@
ErrorCode WM_MISC_ISSUE_REJECT_REASON_REQUIRED = new ErrorCode(1_040_715_007, "瀹℃牳涓嶉�氳繃鏃跺繀椤诲~鍐欎笉閫氳繃鍘熷洜");
ErrorCode WM_MISC_ISSUE_LINE_NOT_EXISTS = new ErrorCode(1_040_715_100, "鏉傞」鍑哄簱鍗曡涓嶅瓨鍦�");
ErrorCode WM_MISC_ISSUE_DETAIL_NOT_EXISTS = new ErrorCode(1_040_715_200, "鏉傞」鍑哄簱鍗曟槑缁嗕笉瀛樺湪");
+ ErrorCode WM_MISC_ISSUE_QUANTITY_INVALID = new ErrorCode(1_040_715_008, "鏉傞」鍑哄簱鏁伴噺涓嶈兘涓虹┖");
// ========== MES 浠撳簱绠$悊-鏉傞」鍏ュ簱鍗曪紙1-040-716-000锛� ==========
ErrorCode WM_MISC_RECEIPT_NOT_EXISTS = new ErrorCode(1_040_716_000, "鏉傞」鍏ュ簱鍗曚笉瀛樺湪");
@@ -865,6 +870,7 @@
ErrorCode PD_PROJECT_NOT_APPROVING = new ErrorCode(1_040_800_009, "鍙湁瀹℃壒涓姸鎬佺殑璁捐椤圭洰鎵嶈兘瀹℃牳");
ErrorCode PD_PROJECT_AUDIT_REJECT_REASON_REQUIRED = new ErrorCode(1_040_800_010, "瀹℃牳涓嶉�氳繃鏃跺繀椤诲~鍐欎笉閫氳繃鍘熷洜");
ErrorCode PD_PROJECT_IMPORT_LIST_IS_EMPTY = new ErrorCode(1_040_800_011, "瀵煎叆璁捐椤圭洰鏁版嵁涓嶈兘涓虹┖");
+ ErrorCode PD_PROJECT_NO_DOCUMENT = new ErrorCode(1_040_800_012, "璁捐椤圭洰鑷冲皯闇�瑕佷竴浠借祫鏂欐墠鍏佽鎻愪氦瀹℃壒");
// ========== MES 浜у搧璁捐-璧勬枡瀛愯〃锛�1-040-801-000锛� ==========
ErrorCode PD_DOCUMENT_NOT_EXISTS = new ErrorCode(1_040_801_000, "璁捐璧勬枡涓嶅瓨鍦�");
@@ -902,6 +908,7 @@
ErrorCode PD_TECH_CONFIRM_NOT_PENDING_AUDIT = new ErrorCode(1_040_808_004, "鍙湁寰呭鏍哥姸鎬佺殑鎶�鏈‘璁ゅ嚱鎵嶈兘瀹℃牳");
ErrorCode PD_TECH_CONFIRM_REJECT_REASON_REQUIRED = new ErrorCode(1_040_808_007, "瀹℃牳涓嶉�氳繃鏃跺繀椤诲~鍐欎笉閫氳繃鍘熷洜");
ErrorCode PD_TECH_CONFIRM_NOT_AUDITED_FOR_CUSTOMER_CONFIRM = new ErrorCode(1_040_808_008, "鍙湁宸插鏍哥姸鎬佺殑鎶�鏈‘璁ゅ嚱鎵嶈兘杩涜瀹㈡埛纭");
+ ErrorCode PD_TECH_CONFIRM_NO_REQUIRED = new ErrorCode(1_040_808_009, "纭鍑界紪鍙蜂笉鑳戒负绌�");
// ========== MES 浜у搧璁捐-浜у搧妗f涓庡熀纭�鏁版嵁锛�1-040-809-000锛� ==========
ErrorCode PD_PRODUCT_NOT_EXISTS = new ErrorCode(1_040_809_000, "浜у搧妗f涓嶅瓨鍦�");
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pd/processparamtemplate/MesPdProcessParamTemplateServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pd/processparamtemplate/MesPdProcessParamTemplateServiceImpl.java
index d12b356..c3e4fb7 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pd/processparamtemplate/MesPdProcessParamTemplateServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pd/processparamtemplate/MesPdProcessParamTemplateServiceImpl.java
@@ -56,9 +56,16 @@
@Override
@Transactional(rollbackFor = Exception.class)
public Long createProcessParamTemplate(MesPdProcessParamTemplateSaveReqVO createReqVO) {
- // 1. 鐢熸垚妯℃澘缂栫爜
- String templateCode = autoCodeRecordService.generateAutoCode(
- MesMdAutoCodeRuleCodeEnum.PD_PROCESS_PARAM_TEMPLATE_CODE.getCode());
+ // 1. 浣跨敤鎵嬪~缂栫爜锛屾垨鑷姩鐢熸垚缂栫爜
+ String templateCode = createReqVO.getTemplateCode();
+ if (StrUtil.isNotBlank(templateCode)) {
+ if (templateMapper.selectByTemplateCode(templateCode) != null) {
+ throw exception(PD_PROCESS_PARAM_TEMPLATE_CODE_DUPLICATE);
+ }
+ } else {
+ templateCode = autoCodeRecordService.generateAutoCode(
+ MesMdAutoCodeRuleCodeEnum.PD_PROCESS_PARAM_TEMPLATE_CODE.getCode());
+ }
// 2. 鎻掑叆妯℃澘涓昏〃
MesPdProcessParamTemplateDO template = BeanUtils.toBean(createReqVO, MesPdProcessParamTemplateDO.class);
template.setTemplateCode(templateCode);
@@ -72,9 +79,19 @@
@Transactional(rollbackFor = Exception.class)
public void updateProcessParamTemplate(MesPdProcessParamTemplateSaveReqVO updateReqVO) {
// 1. 鏍¢獙瀛樺湪
- validateProcessParamTemplateExists(updateReqVO.getId());
- // 2. 鏇存柊妯℃澘涓昏〃
+ MesPdProcessParamTemplateDO existing = validateProcessParamTemplateExists(updateReqVO.getId());
+ // 2. 鏇存柊妯℃澘涓昏〃锛氱紪鐮佺暀绌烘垨鏈彉鍖栧垯涓嶄慨鏀癸紱濉啓浜嗘柊缂栫爜鍒欐牎楠屽敮涓�
MesPdProcessParamTemplateDO updateObj = BeanUtils.toBean(updateReqVO, MesPdProcessParamTemplateDO.class);
+ String templateCode = updateReqVO.getTemplateCode();
+ if (StrUtil.isNotBlank(templateCode) && !StrUtil.equals(templateCode, existing.getTemplateCode())) {
+ if (templateMapper.selectByTemplateCode(templateCode) != null) {
+ throw exception(PD_PROCESS_PARAM_TEMPLATE_CODE_DUPLICATE);
+ }
+ updateObj.setTemplateCode(templateCode);
+ } else {
+ // 缃┖锛岄伩鍏� MyBatis-Plus 鏇存柊鏃惰鐩栧師缂栫爜
+ updateObj.setTemplateCode(null);
+ }
templateMapper.updateById(updateObj);
// 3. 鍒犻櫎鏃ф槑缁嗗苟閲嶆柊鎻掑叆锛堝揩鐓фā寮忥細鍏堝垹鍚庢彃锛�
detailMapper.deleteByTemplateId(updateReqVO.getId());
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pd/project/MesPdProjectServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pd/project/MesPdProjectServiceImpl.java
index cf282cf..c7c4a34 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pd/project/MesPdProjectServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pd/project/MesPdProjectServiceImpl.java
@@ -217,6 +217,9 @@
}
// 2. 鏍¢獙璇ラ」鐩笅鎵�鏈夎祫鏂欏鏍歌褰曞潎宸插鏍革紙涓嶅瓨鍦ㄥ緟瀹℃牳鐨勮褰曪級
List<MesPdDocumentDO> documents = documentService.getDocumentListByProjectId(id);
+ if (CollUtil.isEmpty(documents)) {
+ throw exception(PD_PROJECT_NO_DOCUMENT);
+ }
List<Long> documentIds = documents.stream().map(MesPdDocumentDO::getId).toList();
if (documentAuditMapper.existsPendingAuditByDocumentIds(documentIds)) {
throw exception(PD_PROJECT_AUDIT_NOT_FINISHED);
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pd/techconfirm/ProductTechConfirmServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pd/techconfirm/ProductTechConfirmServiceImpl.java
index 80004d8..88c5280 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pd/techconfirm/ProductTechConfirmServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pd/techconfirm/ProductTechConfirmServiceImpl.java
@@ -260,8 +260,9 @@
}
private void validateConfirmNoUnique(String confirmNo, Long excludeId) {
- if (confirmNo == null) {
- return;
+ // 纭鍑界紪鍙峰繀濉細VO 涓婄殑 @NotBlank 鍙鐩栨帴鍙e叆鍙傦紝Service 鍐咃紙鍚鍏ワ級浠嶉渶鏄惧紡鏍¢獙
+ if (StrUtil.isBlank(confirmNo)) {
+ throw exception(PD_TECH_CONFIRM_NO_REQUIRED);
}
ProductTechConfirmDO techConfirm = techConfirmMapper.selectOne(
ProductTechConfirmDO::getConfirmNo, confirmNo);
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/feedback/MesProFeedbackServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/feedback/MesProFeedbackServiceImpl.java
index 273de0a..e4752c9 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/feedback/MesProFeedbackServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/feedback/MesProFeedbackServiceImpl.java
@@ -235,7 +235,9 @@
@Override
public void rejectFeedback(Long id) {
// 1. 鏍¢獙瀛樺湪 + 瀹℃壒涓姸鎬�
- validateFeedbackStatusApproving(id);
+ MesProFeedbackDO feedback = validateFeedbackStatusApproving(id);
+ // 1.1 鏍¢獙褰撳墠鐧诲綍浜烘槸璇ユ姤宸ュ崟鐨勬寚瀹氬鏍镐汉
+ validateCurrentUserIsApprover(feedback);
// 2. 鏇存柊鐘舵�佷负鑽夌
feedbackMapper.updateById(new MesProFeedbackDO().setId(id)
@@ -247,6 +249,8 @@
public boolean approveFeedback(MesProFeedbackApproveReqVO reqVO) {
// 1.1 鏍¢獙瀛樺湪 + 瀹℃壒涓姸鎬�
MesProFeedbackDO feedback = validateFeedbackStatusApproving(reqVO.getId());
+ // 1.1.1 鏍¢獙褰撳墠鐧诲綍浜烘槸璇ユ姤宸ュ崟鐨勬寚瀹氬鏍镐汉
+ validateCurrentUserIsApprover(feedback);
// 1.2 鏍¢獙鎶ュ伐鏁伴噺 > 0
if (feedback.getFeedbackQuantity() == null
|| feedback.getFeedbackQuantity().compareTo(BigDecimal.ZERO) <= 0) {
@@ -412,6 +416,23 @@
}
/**
+ * 鏍¢獙褰撳墠鐧诲綍鐢ㄦ埛鏄惁涓烘姤宸ュ崟鎸囧畾鐨勫鏍镐汉
+ *
+ * 鎶ュ伐鍗曞垱寤烘椂蹇呴』鎸囧畾 approveUserId锛屽鎵归�氳繃/椹冲洖鍙兘鐢辫瀹℃牳浜烘搷浣滐紝
+ * 閬垮厤浠绘剰鎷ユ湁鑿滃崟鏉冮檺鐨勭敤鎴疯秺鏉冨鎵广��
+ *
+ * @param feedback 鎶ュ伐鍗�
+ */
+ private void validateCurrentUserIsApprover(MesProFeedbackDO feedback) {
+ if (feedback.getApproveUserId() == null) {
+ throw exception(PRO_FEEDBACK_APPROVER_NOT_CONFIGURED);
+ }
+ if (!feedback.getApproveUserId().equals(getLoginUserId())) {
+ throw exception(PRO_FEEDBACK_NOT_APPROVER);
+ }
+ }
+
+ /**
* 鏍¢獙鎶ュ伐鍗曠殑涓氬姟鏁版嵁锛堝垱寤� & 淇敼鍏辩敤锛�
*
* <p>浠ョ敓浜т换鍔′负鏍稿績锛氬墠绔彧闇�浼� taskId锛寃orkOrderId銆乺outeId銆乸rocessId銆乮temId銆亀orkstationId
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemreceipt/MesWmItemReceiptService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemreceipt/MesWmItemReceiptService.java
index fe184a1..2def9d7 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemreceipt/MesWmItemReceiptService.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemreceipt/MesWmItemReceiptService.java
@@ -68,7 +68,10 @@
void submitItemReceipt(Long id);
/**
- * 鎵ц涓婃灦锛堝緟涓婃灦 鈫� 寰呭叆搴擄級
+ * 鎵ц涓婃灦鏍¢獙锛堜粎鏍¢獙宸插鎵瑰崟鎹殑鏄庣粏鏁伴噺涓�鑷存�э紝涓嶄慨鏀瑰崟鎹姸鎬侊級
+ *
+ * 鍗曟嵁鐘舵�佸彧鑳界敱瀹℃牳锛圓PPROVING 鈫� APPROVED锛変笌鍏ュ簱锛圓PPROVED 鈫� FINISHED锛夋帹杩涳紝
+ * 鏈柟娉曚笉寰楁妸鍗曟嵁鐩存帴缃负宸插鎵广��
*
* @param id 缂栧彿
*/
@@ -89,7 +92,7 @@
void cancelItemReceipt(Long id);
/**
- * 鏍¢獙閲囪喘鍏ュ簱鍗曞瓨鍦ㄤ笖澶勪簬鍙紪杈戠姸鎬侊紙鑽夌鎴栧緟涓婃灦锛�
+ * 鏍¢獙閲囪喘鍏ュ簱鍗曞瓨鍦ㄤ笖澶勪簬鍙紪杈戠姸鎬侊紙浠呰崏绋匡級
*
* @param id 缂栧彿
* @return 閲囪喘鍏ュ簱鍗�
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemreceipt/MesWmItemReceiptServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemreceipt/MesWmItemReceiptServiceImpl.java
index ef1b5c0..018802e 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemreceipt/MesWmItemReceiptServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemreceipt/MesWmItemReceiptServiceImpl.java
@@ -265,9 +265,9 @@
@Override
@Transactional(rollbackFor = Exception.class)
public void stockItemReceipt(Long id) {
- // 鏍¢獙瀛樺湪
+ // 鏍¢獙瀛樺湪 + 宸插鎵癸紙鐘舵�佸彧鑳界敱 audit 鎺ㄨ繘锛欰PPROVING 鈫� APPROVED锛�
MesWmItemReceiptDO receipt = validateItemReceiptExists(id);
- if (ObjUtil.notEqual(MesWmItemReceiptStatusEnum.APPROVING.getStatus(), receipt.getStatus())) {
+ if (ObjUtil.notEqual(MesWmItemReceiptStatusEnum.APPROVED.getStatus(), receipt.getStatus())) {
throw exception(WM_ITEM_RECEIPT_STATUS_ERROR);
}
// 鏍¢獙姣忚鏄庣粏鏁伴噺涔嬪拰鏄惁绛変簬琛屽叆搴撴暟閲�
@@ -283,10 +283,8 @@
throw exception(WM_ITEM_RECEIPT_DETAIL_QUANTITY_MISMATCH);
}
}
-
- // 鎵ц涓婃灦锛堝緟涓婃灦 鈫� 寰呭叆搴擄級
- itemReceiptMapper.updateById(new MesWmItemReceiptDO()
- .setId(id).setStatus(MesWmItemReceiptStatusEnum.APPROVED.getStatus()));
+ // 娉ㄦ剰锛氭湰鏂规硶浠呭仛鏁伴噺涓�鑷存�ф牎楠岋紝涓嶅緱淇敼鍗曟嵁鐘舵�併��
+ // 鐘舵�佹祦杞敱 audit锛圓PPROVING 鈫� APPROVED锛変笌 finish锛圓PPROVED 鈫� FINISHED锛夎礋璐c��
}
@Override
@@ -408,12 +406,8 @@
@Override
public MesWmItemReceiptDO validateItemReceiptEditable(Long id) {
- MesWmItemReceiptDO receipt = validateItemReceiptExists(id);
- if (ObjUtil.notEqual(receipt.getStatus(), MesWmItemReceiptStatusEnum.PREPARE.getStatus())
- && ObjUtil.notEqual(receipt.getStatus(), MesWmItemReceiptStatusEnum.APPROVING.getStatus())) {
- throw exception(WM_ITEM_RECEIPT_STATUS_NOT_PREPARE);
- }
- return receipt;
+ // 浠呰崏绋跨姸鎬佸厑璁哥紪杈戣/鏄庣粏锛涘鎵逛腑锛圓PPROVING锛夊凡閿佸畾锛岄伩鍏嶇粫杩囧鏍镐慨鏀规暟鎹�
+ return validateItemReceiptExistsAndDraft(id);
}
private MesWmItemReceiptDO validateItemReceiptExists(Long id) {
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/miscissue/MesWmMiscIssueServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/miscissue/MesWmMiscIssueServiceImpl.java
index fae1298..ac5ada3 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/miscissue/MesWmMiscIssueServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/miscissue/MesWmMiscIssueServiceImpl.java
@@ -27,6 +27,7 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated;
+import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.List;
@@ -198,12 +199,22 @@
List<MesWmMiscIssueLineDO> lines = miscIssueLineService.getMiscIssueLineListByIssueId(issue.getId());
wmTransactionService.createTransactionList(convertList(lines, line -> new MesWmTransactionSaveReqDTO()
.setType(MesWmTransactionTypeEnum.OUT.getType()).setItemId(line.getItemId())
- .setQuantity(line.getQuantity().negate()) // 鍑哄簱鏁伴噺涓鸿礋鏁�
+ .setQuantity(negateQuantity(line.getQuantity())) // 鍑哄簱鏁伴噺涓鸿礋鏁�
.setBatchId(line.getBatchId()).setBatchCode(line.getBatchCode())
.setWarehouseId(line.getWarehouseId()).setLocationId(line.getLocationId()).setAreaId(line.getAreaId())
.setBizType(MesBizTypeConstants.WM_MISC_ISSUE).setBizId(issue.getId()).setBizCode(issue.getCode()).setBizLineId(line.getId())));
}
+ /**
+ * 鍑哄簱鏁伴噺鍙栬礋锛氭暟閲忎负绌烘椂鎶涘嚭鏄庣‘鐨勪笟鍔″紓甯革紝閬垮厤 NPE
+ */
+ private BigDecimal negateQuantity(BigDecimal quantity) {
+ if (quantity == null) {
+ throw exception(WM_MISC_ISSUE_QUANTITY_INVALID);
+ }
+ return quantity.negate();
+ }
+
@Override
@Transactional(rollbackFor = Exception.class)
public void cancelMiscIssue(Long id) {
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/miscreceipt/MesWmMiscReceiptServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/miscreceipt/MesWmMiscReceiptServiceImpl.java
index a96defb..904b168 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/miscreceipt/MesWmMiscReceiptServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/miscreceipt/MesWmMiscReceiptServiceImpl.java
@@ -195,6 +195,7 @@
wmTransactionService.createTransactionList(convertList(lines, line -> new MesWmTransactionSaveReqDTO()
.setType(MesWmTransactionTypeEnum.IN.getType()).setItemId(line.getItemId())
.setQuantity(line.getQuantity()) // 鍏ュ簱鏁伴噺涓烘鏁�
+ .setBatchCode(line.getBatchCode()) // 鎵规绠$悊鐗╂枡闇�鎼哄甫鎵规鍙�
.setWarehouseId(line.getWarehouseId()).setLocationId(line.getLocationId()).setAreaId(line.getAreaId())
.setBizType(MesBizTypeConstants.WM_MISC_RECPT).setBizId(receipt.getId()).setBizCode(receipt.getCode()).setBizLineId(line.getId())));
}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnvendor/MesWmReturnVendorDetailServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnvendor/MesWmReturnVendorDetailServiceImpl.java
index efc903c..1baf365 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnvendor/MesWmReturnVendorDetailServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnvendor/MesWmReturnVendorDetailServiceImpl.java
@@ -32,6 +32,10 @@
@Resource
@Lazy
private MesWmReturnVendorLineService returnVendorLineService;
+ // 涓� ReturnVendorServiceImpl 鐩镐簰寮曠敤锛岄』鐢� @Lazy 鎵撶牬寰幆
+ @Resource
+ @Lazy
+ private MesWmReturnVendorService returnVendorService;
@Resource
private MesMdmItemService mdmItemService;
@Resource
@@ -66,6 +70,8 @@
* 鏍¢獙鏄庣粏鍒涘缓/淇敼鐨勫叕鍏辨暟鎹�
*/
private void validateDetailSaveData(MesWmReturnVendorDetailSaveReqVO reqVO) {
+ // 鏍¢獙鐖跺崟锛堥��璐у崟锛夊浜庡噯澶囦腑鐘舵�侊紝瀹℃壒鏈熼棿鍙婁箣鍚庣姝㈠鍒犳敼鏄庣粏
+ returnVendorService.validateReturnVendorExistsAndPrepare(reqVO.getReturnId());
// 鏍¢獙鐖舵暟鎹紙琛岋級瀛樺湪
MesWmReturnVendorLineDO line = returnVendorLineService.validateReturnVendorLineExists(reqVO.getLineId());
if (ObjUtil.notEqual(line.getReturnId(), reqVO.getReturnId())) {
@@ -85,7 +91,9 @@
@Override
public void deleteReturnVendorDetail(Long id) {
// 鏍¢獙瀛樺湪
- validateReturnVendorDetailExists(id);
+ MesWmReturnVendorDetailDO detail = validateReturnVendorDetailExists(id);
+ // 鏍¢獙鐖跺崟澶勪簬鍑嗗涓姸鎬侊紝瀹℃壒鏈熼棿鍙婁箣鍚庣姝㈠垹闄ゆ槑缁�
+ returnVendorService.validateReturnVendorExistsAndPrepare(detail.getReturnId());
// 鍒犻櫎
returnVendorDetailMapper.deleteById(id);
}
@@ -115,10 +123,12 @@
returnVendorDetailMapper.deleteByLineId(lineId);
}
- private void validateReturnVendorDetailExists(Long id) {
- if (returnVendorDetailMapper.selectById(id) == null) {
+ private MesWmReturnVendorDetailDO validateReturnVendorDetailExists(Long id) {
+ MesWmReturnVendorDetailDO detail = returnVendorDetailMapper.selectById(id);
+ if (detail == null) {
throw exception(WM_RETURN_VENDOR_DETAIL_NOT_EXISTS);
}
+ return detail;
}
/**
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnvendor/MesWmReturnVendorService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnvendor/MesWmReturnVendorService.java
index c348dc4..7baed4d 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnvendor/MesWmReturnVendorService.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnvendor/MesWmReturnVendorService.java
@@ -95,7 +95,9 @@
void auditReturnVendor(Long id, Boolean pass, String reviewRemark);
/**
- * 鎵ц鎷h揣锛堝緟鎷h揣 -> 寰呮墽琛岄��璐э級
+ * 鎵ц鎷h揣鏍¢獙锛堜粎鏍¢獙宸插鎵瑰崟鎹殑鏄庣粏鏁伴噺涓�鑷存�э紝涓嶄慨鏀瑰崟鎹姸鎬侊級
+ *
+ * 鍗曟嵁鐘舵�佸彧鑳界敱瀹℃牳锛圓PPROVING 鈫� APPROVED锛変笌閫�璐э紙APPROVED 鈫� FINISHED锛夋帹杩涖��
*
* @param id 缂栧彿
*/
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnvendor/MesWmReturnVendorServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnvendor/MesWmReturnVendorServiceImpl.java
index a05baf6..9635618 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnvendor/MesWmReturnVendorServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnvendor/MesWmReturnVendorServiceImpl.java
@@ -185,14 +185,15 @@
@Override
@Transactional(rollbackFor = Exception.class)
public void stockReturnVendor(Long id) {
- // 鏍¢獙瀛樺湪
+ // 鏍¢獙瀛樺湪 + 宸插鎵癸紙鐘舵�佸彧鑳界敱 audit 鎺ㄨ繘锛欰PPROVING 鈫� APPROVED锛�
MesWmReturnVendorDO returnVendor = validateReturnVendorExists(id);
- if (ObjUtil.notEqual(MesWmReturnVendorStatusEnum.APPROVING.getStatus(), returnVendor.getStatus())) {
+ if (ObjUtil.notEqual(MesWmReturnVendorStatusEnum.APPROVED.getStatus(), returnVendor.getStatus())) {
throw exception(WM_RETURN_VENDOR_STATUS_INVALID);
}
- // 鎵ц鎷h揣锛堝緟鎷h揣 -> 寰呮墽琛岄��璐э級
- returnVendorMapper.updateById(new MesWmReturnVendorDO()
- .setId(id).setStatus(MesWmReturnVendorStatusEnum.APPROVED.getStatus()));
+ // 浠呮牎楠岃鏁伴噺涓庢槑缁嗘暟閲忎竴鑷达紝涓嶄慨鏀瑰崟鎹姸鎬�
+ if (!Boolean.TRUE.equals(checkReturnVendorQuantity(id))) {
+ throw exception(WM_RETURN_VENDOR_DETAIL_QUANTITY_MISMATCH);
+ }
}
@Override
@@ -208,6 +209,10 @@
if (CollUtil.isEmpty(details)) {
throw exception(WM_RETURN_VENDOR_NO_DETAIL);
}
+ // 1.3 鏍¢獙姣忚鏄庣粏鏁伴噺涔嬪拰绛変簬琛岄��璐ф暟閲忥紝閬垮厤鍑哄簱鏁伴噺涓庡崟鎹笉涓�鑷�
+ if (!Boolean.TRUE.equals(checkReturnVendorQuantity(id))) {
+ throw exception(WM_RETURN_VENDOR_DETAIL_QUANTITY_MISMATCH);
+ }
// 2. 閬嶅巻鎵�鏈夋槑缁嗭紝鍒涘缓搴撳瓨浜嬪姟锛堟墸鍑忓簱瀛� + 璁板綍娴佹按锛�
createTransactionList(returnVendor, details);
@@ -220,7 +225,7 @@
private void createTransactionList(MesWmReturnVendorDO returnVendor, List<MesWmReturnVendorDetailDO> details) {
wmTransactionService.createTransactionList(convertList(details, detail -> new MesWmTransactionSaveReqDTO()
.setType(MesWmTransactionTypeEnum.OUT.getType()).setItemId(detail.getItemId())
- .setQuantity(detail.getQuantity().negate()) // 鍑哄簱鏁伴噺涓鸿礋鏁�
+ .setQuantity(negateQuantity(detail.getQuantity())) // 鍑哄簱鏁伴噺涓鸿礋鏁�
.setBatchId(detail.getBatchId()).setBatchCode(detail.getBatchCode())
.setWarehouseId(detail.getWarehouseId()).setLocationId(detail.getLocationId()).setAreaId(detail.getAreaId())
.setVendorId(returnVendor.getVendorId())
@@ -228,6 +233,16 @@
.setBizCode(returnVendor.getCode()).setBizLineId(detail.getLineId())));
}
+ /**
+ * 鍑哄簱鏁伴噺鍙栬礋锛氭暟閲忎负绌烘椂鎶涘嚭鏄庣‘鐨勪笟鍔″紓甯革紝閬垮厤 NPE
+ */
+ private BigDecimal negateQuantity(BigDecimal quantity) {
+ if (quantity == null) {
+ throw exception(WM_RETURN_VENDOR_DETAIL_QUANTITY_INVALID);
+ }
+ return quantity.negate();
+ }
+
@Override
@Transactional(rollbackFor = Exception.class)
public void cancelReturnVendor(Long id) {
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/stocktaking/task/MesWmStockTakingTaskLineServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/stocktaking/task/MesWmStockTakingTaskLineServiceImpl.java
index 93662a1..9930376 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/stocktaking/task/MesWmStockTakingTaskLineServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/stocktaking/task/MesWmStockTakingTaskLineServiceImpl.java
@@ -252,6 +252,8 @@
}
// 0. 鏍¢獙鐩樼偣浠诲姟澶勪簬鐩樼偣涓姸鎬侊紙涓庝汉宸ュ綍鍏ョ洏鐐圭粨鏋滃彛寰勪竴鑷达紝浠呯洏鐐逛腑鍙鍏ワ級
stockTakingTaskService.validateStockTakingTaskExistsAndApproving(taskId);
+ // 0.1 缁撴灉瀹℃壒宸叉彁浜や笖鏈鏍告椂锛岀洏鐐圭粨鏋滃凡閿佸畾锛岀姝㈠啀瀵煎叆瀹炵洏鏁伴噺
+ stockTakingTaskService.validateResultApprovalNotPending(taskId);
// 1. 鑾峰彇鐩樼偣浠诲姟琛�
List<MesWmStockTakingTaskLineDO> lines = stockTakingTaskLineMapper.selectListByTaskId(taskId);
if (CollUtil.isEmpty(lines)) {
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/stocktaking/task/MesWmStockTakingTaskResultServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/stocktaking/task/MesWmStockTakingTaskResultServiceImpl.java
index a7fbc02..93299b4 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/stocktaking/task/MesWmStockTakingTaskResultServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/stocktaking/task/MesWmStockTakingTaskResultServiceImpl.java
@@ -19,6 +19,7 @@
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.WM_STOCK_TAKING_TASK_LINE_ALREADY_TAKEN;
+import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.WM_STOCK_TAKING_TASK_LINE_NOT_MATCH;
import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.WM_STOCK_TAKING_TASK_RESULT_NOT_EXISTS;
/**
@@ -52,8 +53,9 @@
@Override
@Transactional(rollbackFor = Exception.class)
public Long createStockTakingTaskResult(MesWmStockTakingTaskResultSaveReqVO createReqVO) {
- // 1. 鏍¢獙浠诲姟澶勪簬鐩樼偣涓姸鎬�
+ // 1. 鏍¢獙浠诲姟澶勪簬鐩樼偣涓姸鎬侊紝涓旂粨鏋滃鎵瑰凡鎻愪氦銆佹湭瀹℃牳鏃剁姝㈠啓鍏�
stockTakingTaskService.validateStockTakingTaskExistsAndApproving(createReqVO.getTaskId());
+ stockTakingTaskService.validateResultApprovalNotPending(createReqVO.getTaskId());
// 2. 纭畾 lineId 鍜岃处闈㈡暟閲�
Long lineId = createReqVO.getLineId();
@@ -71,10 +73,16 @@
} else {
// 2.3 濡傛灉浼犻�掍簡 lineId锛屼粠 line 涓幏鍙� quantity
existingLine = stockTakingTaskLineService.validateStockTakingTaskLineExists(lineId);
+ // 2.4 闃叉涓插崟锛氱洏鐐硅蹇呴』灞炰簬璇锋眰鎸囧畾鐨勭洏鐐逛换鍔�
+ if (ObjUtil.notEqual(existingLine.getTaskId(), createReqVO.getTaskId())) {
+ throw exception(WM_STOCK_TAKING_TASK_LINE_NOT_MATCH);
+ }
}
- if (existingLine != null
- && existingLine.getTakingQuantity() != null
- && existingLine.getTakingQuantity().compareTo(BigDecimal.ZERO) > 0) {
+ // 2.5 闃叉閲嶅锛氬悓涓�鐩樼偣浠诲姟琛屽彧鍏佽瀛樺湪涓�鏉$洏鐐圭粨鏋滐紙鏃犺瀹炵洏鏁伴噺鏄惁涓� 0锛�
+ Long finalLineId = lineId;
+ boolean resultExists = stockTakingTaskResultMapper.selectListByTaskId(createReqVO.getTaskId()).stream()
+ .anyMatch(result -> Objects.equals(result.getLineId(), finalLineId));
+ if (resultExists) {
throw exception(WM_STOCK_TAKING_TASK_LINE_ALREADY_TAKEN);
}
BigDecimal quantity = existingLine != null ? existingLine.getQuantity() : BigDecimal.ZERO; // 璐﹂潰鏁伴噺
@@ -95,8 +103,9 @@
updateReqVO.setLineId(null); // lineId 涓嶈兘淇敼锛岄伩鍏嶈鎿嶄綔
// 1.1 鏍¢獙璁板綍瀛樺湪
MesWmStockTakingTaskResultDO oldResult = validateStockTakingTaskResultExists(updateReqVO.getId());
- // 1.2 鏍¢獙浠诲姟澶勪簬鐩樼偣涓姸鎬�
+ // 1.2 鏍¢獙浠诲姟澶勪簬鐩樼偣涓姸鎬侊紝涓旂粨鏋滃鎵瑰凡鎻愪氦銆佹湭瀹℃牳鏃剁姝慨鏀�
stockTakingTaskService.validateStockTakingTaskExistsAndApproving(oldResult.getTaskId());
+ stockTakingTaskService.validateResultApprovalNotPending(oldResult.getTaskId());
// 2. 鏇存柊 result 璁板綍
MesWmStockTakingTaskResultDO result = BeanUtils.toBean(updateReqVO, MesWmStockTakingTaskResultDO.class);
@@ -112,15 +121,21 @@
public void deleteStockTakingTaskResult(Long id) {
// 1.1 鏍¢獙 result 鏄惁瀛樺湪
MesWmStockTakingTaskResultDO result = validateStockTakingTaskResultExists(id);
- // 1.2 鏍¢獙 task 鏄惁澶勪簬 APPROVING 鐘舵��
+ // 1.2 鏍¢獙 task 鏄惁澶勪簬 APPROVING 鐘舵�侊紝涓旂粨鏋滃鎵瑰凡鎻愪氦銆佹湭瀹℃牳鏃剁姝㈠垹闄�
stockTakingTaskService.validateStockTakingTaskExistsAndApproving(result.getTaskId());
+ stockTakingTaskService.validateResultApprovalNotPending(result.getTaskId());
// 2. 鍒犻櫎 result 璁板綍
stockTakingTaskResultMapper.deleteById(id);
- // 3. 鏇存柊瀵瑰簲 line 鐨勭洏鐐规暟閲忓拰鐘舵��
+ // 3. 鎸夊墿浣欑洏鐐圭粨鏋滈噸绠楀搴� line 鐨勫疄鐩樻暟閲忥紙鏃犲墿浣欑粨鏋滄椂缃� 0锛夛紝閬垮厤瑕嗙洊鎴愯礋鏁�
+ BigDecimal remainingTakingQuantity = stockTakingTaskResultMapper.selectListByTaskId(result.getTaskId()).stream()
+ .filter(item -> Objects.equals(item.getLineId(), result.getLineId()))
+ .map(MesWmStockTakingTaskResultDO::getTakingQuantity)
+ .filter(Objects::nonNull)
+ .reduce(BigDecimal.ZERO, BigDecimal::add);
stockTakingTaskLineService.updateStockTakingTaskLineTakingQuantity(
- result.getLineId(), result.getTakingQuantity().negate());
+ result.getLineId(), remainingTakingQuantity);
}
@Override
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/stocktaking/task/MesWmStockTakingTaskService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/stocktaking/task/MesWmStockTakingTaskService.java
index 082c64e..e0f5bb7 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/stocktaking/task/MesWmStockTakingTaskService.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/stocktaking/task/MesWmStockTakingTaskService.java
@@ -135,6 +135,15 @@
MesWmStockTakingTaskDO validateStockTakingTaskExistsAndApproving(Long id);
/**
+ * 鏍¢獙鐩樼偣浠诲姟鐨勭粨鏋滃鎵规湭澶勪簬銆屽凡鎻愪氦銆佸緟瀹℃牳銆嶇姸鎬�
+ *
+ * 璇ラ樁娈电洏鐐圭粨鏋滃凡琚攣瀹氾紝绂佹鏂板銆佷慨鏀广�佸垹闄ょ洏鐐圭粨鏋滄垨瀵煎叆瀹炵洏鏁伴噺銆�
+ *
+ * @param id 鐩樼偣浠诲姟缂栧彿
+ */
+ void validateResultApprovalNotPending(Long id);
+
+ /**
* 鍒嗛〉鏌ヨ鐩樼偣浠诲姟
*
* @param pageReqVO 鍒嗛〉鏌ヨ鏉′欢
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/stocktaking/task/MesWmStockTakingTaskServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/stocktaking/task/MesWmStockTakingTaskServiceImpl.java
index 09ae4b4..acb2bff 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/stocktaking/task/MesWmStockTakingTaskServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/stocktaking/task/MesWmStockTakingTaskServiceImpl.java
@@ -276,6 +276,14 @@
return task.getReviewerId() == null && task.getReviewTime() != null;
}
+ @Override
+ public void validateResultApprovalNotPending(Long id) {
+ MesWmStockTakingTaskDO task = validateStockTakingTaskExists(id);
+ if (isResultApprovalPending(task)) {
+ throw exception(WM_STOCK_TAKING_TASK_RESULT_APPROVAL_PENDING);
+ }
+ }
+
/**
* 鑾峰彇鐢ㄦ埛鏄电О
*
diff --git a/yudao-server/src/main/resources/application-local.yaml b/yudao-server/src/main/resources/application-local.yaml
index 01d078a..7324f5c 100644
--- a/yudao-server/src/main/resources/application-local.yaml
+++ b/yudao-server/src/main/resources/application-local.yaml
@@ -65,17 +65,17 @@
primary: master
datasource:
master:
- url: jdbc:mysql://localhost:3306/mom-xgdl?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true # MySQL Connector/J 8.X 杩炴帴鐨勭ず渚�
+ url: jdbc:mysql://192.168.197.128:3306/mom-xgdl?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true # MySQL Connector/J 8.X 杩炴帴鐨勭ず渚�
username: root
- password: 123456
+ password: sugaozhixing.cn
# Redis 閰嶇疆銆俁edisson 榛樿鐨勯厤缃冻澶熶娇鐢紝涓�鑸笉闇�瑕佽繘琛岃皟浼�
data:
redis:
- host: localhost # 鍦板潃
+ host: 192.168.197.128 # 鍦板潃
port: 6379 # 绔彛
database: 0 # 鏁版嵁搴撶储寮�
-# password: 123456
+ password: sugaozhixing.cn
--- #################### 瀹氭椂浠诲姟鐩稿叧閰嶇疆 ####################
@@ -193,7 +193,7 @@
storage: # 鏂囦欢涓婁紶閰嶇疆
path: D:/uploads # 鏂囦欢瀛樺偍鏍圭洰褰曪紙鎸夊疄闄呮湇鍔″櫒璺緞閰嶇疆锛�
url-prefix: /admin-api/system/storage-blob # URL璺緞鍓嶇紑
- domain: http://192.168.0.10:48080 # 鍩熷悕鍓嶇紑锛堟寜瀹為檯鍩熷悕閰嶇疆锛�
+ domain: http://127.0.0.1:48080 # 鍩熷悕鍓嶇紑锛堟寜瀹為檯鍩熷悕閰嶇疆锛�
expired: 120 # token杩囨湡鏃堕棿锛堝垎閽燂級
use-limit: 10 # token浣跨敤娆℃暟涓婇檺
jwt-secret: abcdefghijklmnopqrstuvwxyz0123456789ABCDEFG # JWT瀵嗛挜锛堣嚦灏�32瀛楃锛�
--
Gitblit v1.9.3