From defe1e1c3ade87de0a7990f565f08f93aeb2decc Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期日, 08 十一月 2026 19:31:46 +0800
Subject: [PATCH] fix(bpm): 统一审批标题单号并收紧各模块提交校验
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/itemreceipt/MesWmItemReceiptDO.java | 2
sql/mysql/20261107_item_receipt_approve_time.sql | 3
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/itemreceipt/vo/MesWmItemReceiptRespVO.java | 4
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemreceipt/MesWmItemReceiptServiceImpl.java | 46 +++++++--
sql/mysql/20261108_hrm_sales_process_cancel_permission.sql | 7 +
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/salesnotice/MesWmSalesNoticeServiceImpl.java | 13 ++
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/scrap/MesWmScrapSaleService.java | 2
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/feedback/MesProFeedbackServiceImpl.java | 31 +++++
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/ErrorCodeConstants.java | 6 +
yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceServiceImpl.java | 12 +
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/approval/HrmTransferApplicationServiceImpl.java | 85 +++++++++++++---
yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/util/FlowableUtils.java | 5
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/approval/HrmResignationApplicationServiceImpl.java | 30 ++++-
yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/enums/BpmnVariableConstants.java | 3
14 files changed, 199 insertions(+), 50 deletions(-)
diff --git a/sql/mysql/20261107_item_receipt_approve_time.sql b/sql/mysql/20261107_item_receipt_approve_time.sql
new file mode 100644
index 0000000..556029f
--- /dev/null
+++ b/sql/mysql/20261107_item_receipt_approve_time.sql
@@ -0,0 +1,3 @@
+-- 閲囪喘鍏ュ簱瀹℃壒閫氳繃鏃堕棿锛氱敤浜庝笟鍔″崟鎹鎯呬笌瀵煎嚭銆�
+ALTER TABLE mes_wm_item_receipt
+ ADD COLUMN approve_time DATETIME NULL COMMENT '瀹℃壒閫氳繃鏃堕棿' AFTER process_instance_id;
diff --git a/sql/mysql/20261108_hrm_sales_process_cancel_permission.sql b/sql/mysql/20261108_hrm_sales_process_cancel_permission.sql
new file mode 100644
index 0000000..9337e36
--- /dev/null
+++ b/sql/mysql/20261108_hrm_sales_process_cancel_permission.sql
@@ -0,0 +1,7 @@
+-- 閿�鍞鑹茬殑浜轰簨鐢宠浜哄彲鍦ㄢ�滄垜鐨勬祦绋嬧�濇挙閿�鏈汉鍙戣捣鐨勫疄渚嬨��
+-- BPM 鎾ら攢鎺ュ彛浠嶆寜娴佺▼鍙戣捣浜烘牎楠岋紝涓嶈兘鎾ら攢浠栦汉鐨勫疄渚嬨��
+INSERT INTO system_role_menu (role_id, menu_id, creator, create_time, updater, update_time, deleted, tenant_id)
+SELECT 165, 1220, '1', NOW(), '1', NOW(), b'0', 0
+WHERE EXISTS (SELECT 1 FROM system_role WHERE id = 165 AND deleted = b'0')
+ AND EXISTS (SELECT 1 FROM system_menu WHERE id = 1220 AND permission = 'bpm:process-instance:cancel' AND deleted = b'0')
+ AND NOT EXISTS (SELECT 1 FROM system_role_menu WHERE role_id = 165 AND menu_id = 1220 AND deleted = b'0');
diff --git a/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/enums/BpmnVariableConstants.java b/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/enums/BpmnVariableConstants.java
index 92a3608..f900183 100644
--- a/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/enums/BpmnVariableConstants.java
+++ b/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/enums/BpmnVariableConstants.java
@@ -9,6 +9,9 @@
*/
public class BpmnVariableConstants {
+ /** 涓氬姟娴佺▼鐨勫彲璇诲崟鍙凤紝鐢ㄤ簬寰呭姙娴佺▼鏍囬銆� */
+ public static final String PROCESS_INSTANCE_VARIABLE_BUSINESS_NO = "businessNo";
+
/**
* 娴佺▼瀹炰緥鐨勫彉閲� - 鐘舵��
*
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 6dc6ae3..2a80e32 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
@@ -175,8 +175,9 @@
* @return 杩囨护鍚庣殑琛ㄥ崟
*/
public static Map<String, Object> filterProcessInstanceFormVariable(Map<String, Object> processVariables) {
- processVariables.remove(BpmnVariableConstants.PROCESS_INSTANCE_VARIABLE_STATUS);
- return processVariables;
+ Map<String, Object> filteredVariables = new HashMap<>(processVariables);
+ filteredVariables.remove(BpmnVariableConstants.PROCESS_INSTANCE_VARIABLE_STATUS);
+ return filteredVariables;
}
/**
diff --git a/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceServiceImpl.java b/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceServiceImpl.java
index a4c41e0..b8e9371 100644
--- a/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceServiceImpl.java
+++ b/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceServiceImpl.java
@@ -5,6 +5,7 @@
import cn.hutool.core.convert.Convert;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.lang.Assert;
+import cn.hutool.core.map.MapUtil;
import cn.hutool.core.util.*;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.date.DateUtils;
@@ -844,10 +845,8 @@
validateStartUserSelectAssignees(userId, definition, startUserSelectAssignees, variables);
// 2. 鍒涘缓娴佺▼瀹炰緥
- if (variables == null) {
- variables = new HashMap<>();
- }
- FlowableUtils.filterProcessInstanceFormVariable(variables); // 杩囨护涓�涓嬶紝閬垮厤 ProcessInstance 绯荤粺绾х殑鍙橀噺琚崰鐢�
+ variables = FlowableUtils.filterProcessInstanceFormVariable(
+ variables == null ? new HashMap<>() : variables); // 澶嶅埗骞惰繃婊わ紝閬垮厤淇敼璋冪敤鏂圭殑鍙橀噺
variables.put(BpmnVariableConstants.PROCESS_INSTANCE_VARIABLE_START_USER_ID, userId); // 璁剧疆娴佺▼鍙橀噺锛屽彂璧蜂汉 ID
variables.put(BpmnVariableConstants.PROCESS_INSTANCE_VARIABLE_STATUS, // 娴佺▼瀹炰緥鐘舵�侊細瀹℃壒涓�
BpmProcessInstanceStatusEnum.RUNNING.getStatus());
@@ -914,6 +913,11 @@
}
BpmModelMetaInfoVO.TitleSetting titleSetting = definitionInfo.getTitleSetting();
if (titleSetting == null || !BooleanUtil.isTrue(titleSetting.getEnable())) {
+ String businessNo = MapUtil.getStr(variables,
+ BpmnVariableConstants.PROCESS_INSTANCE_VARIABLE_BUSINESS_NO);
+ if (StrUtil.isNotBlank(businessNo)) {
+ return definition.getName() + "-" + businessNo;
+ }
return definition.getName();
}
AdminUserRespDTO user = adminUserApi.getUser(userId);
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 7edc503..8ed062c 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
@@ -1,6 +1,7 @@
package cn.iocoder.yudao.module.hrm.service.approval;
import cn.hutool.core.collection.CollUtil;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import cn.hutool.core.util.ObjUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.json.JSONUtil;
@@ -150,8 +151,12 @@
@Override
public void updateResignationApplication(HrmResignationApplicationSaveReqVO updateReqVO) {
HrmResignationApplicationDO application = validateResignationApplicationExists(updateReqVO.getId());
+ validateOperator(application, getCurrentUserId());
if (!isEditableResignationStatus(application.getStatus())) {
throw exception(RESIGNATION_APPLICATION_UPDATE_FAIL_NOT_DRAFT);
+ }
+ if (updateReqVO.getUserId() != null && !Objects.equals(updateReqVO.getUserId(), application.getUserId())) {
+ throw exception(RESIGNATION_APPLICATION_APPLICANT_IMMUTABLE);
}
HrmResignationApplicationDO updateObj = BeanUtils.toBean(updateReqVO, HrmResignationApplicationDO.class);
// 涓嶈鐩栫敵璇蜂汉锛涗氦鎺ヤ汉缁熶竴瑙f瀽鎴愨�滃憳宸D + 鐢ㄦ埛ID鈥�
@@ -177,6 +182,7 @@
@Override
public void deleteResignationApplication(Long id) {
HrmResignationApplicationDO application = validateResignationApplicationExists(id);
+ validateOperator(application, getCurrentUserId());
if (!Objects.equals(application.getStatus(), HrmAuditStatusEnum.DRAFT.getStatus())) {
throw exception(RESIGNATION_APPLICATION_UPDATE_FAIL_NOT_DRAFT);
}
@@ -328,6 +334,7 @@
@Transactional(rollbackFor = Exception.class)
public void submitResignationApplication(Long id, String processDefinitionKey, Long userId) {
HrmResignationApplicationDO application = validateResignationApplicationExists(id);
+ validateOperator(application, userId);
if (!isEditableResignationStatus(application.getStatus())) {
throw exception(RESIGNATION_APPLICATION_SUBMIT_FAIL_NOT_DRAFT);
}
@@ -339,9 +346,17 @@
}
ProcessDefinition processDefinition = resolveActiveProcessDefinition(processDefinitionKey);
- String processInstanceId = bpmProcessInstanceApi.createProcessInstance(userId, new BpmProcessInstanceCreateReqDTO()
- .setProcessDefinitionKey(processDefinition.getKey()).setBusinessKey(String.valueOf(id)));
+ String processInstanceId = bpmProcessInstanceApi.createProcessInstance(application.getUserId(), new BpmProcessInstanceCreateReqDTO()
+ .setProcessDefinitionKey(processDefinition.getKey()).setBusinessKey(String.valueOf(id))
+ .setVariables(Map.of("businessNo", application.getNo())));
resignationApplicationMapper.startApproval(id, processInstanceId, HrmAuditStatusEnum.PROCESS.getStatus());
+ }
+
+ private void validateOperator(HrmResignationApplicationDO application, Long operatorId) {
+ if (!Objects.equals(application.getUserId(), operatorId)
+ && !Objects.equals(application.getCreator(), String.valueOf(operatorId))) {
+ throw exception(RESIGNATION_APPLICATION_OPERATOR_NOT_ALLOWED);
+ }
}
private void validateApproveCategoryAndProcessDefinition() {
@@ -436,11 +451,12 @@
log.error("[updateResignationApplicationAuditStatus][application({}) 涓嶅浜庡鎵逛腑锛屾棤娉曟洿鏂板鎵圭粨鏋�({})]", id, status);
throw exception(RESIGNATION_APPLICATION_UPDATE_AUDIT_STATUS_FAIL_NOT_PROCESS);
}
- resignationApplicationMapper.updateById(HrmResignationApplicationDO.builder()
- .id(id)
- .status(status)
- .approveTime(java.time.LocalDateTime.now())
- .build());
+ resignationApplicationMapper.update(null, new LambdaUpdateWrapper<HrmResignationApplicationDO>()
+ .eq(HrmResignationApplicationDO::getId, id)
+ .set(HrmResignationApplicationDO::getStatus, status)
+ .set(HrmResignationApplicationDO::getApproveTime,
+ Objects.equals(status, HrmAuditStatusEnum.APPROVE.getStatus())
+ ? LocalDateTime.now() : null));
}
@Override
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 9482aed..5464870 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
@@ -2,6 +2,7 @@
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ObjUtil;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import cn.iocoder.yudao.framework.common.exception.ServiceException;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
@@ -15,7 +16,9 @@
import cn.iocoder.yudao.module.hrm.controller.admin.approval.vo.HrmTransferApplicationRespVO;
import cn.iocoder.yudao.module.hrm.controller.admin.approval.vo.HrmTransferApplicationSaveReqVO;
import cn.iocoder.yudao.module.hrm.dal.dataobject.approval.HrmTransferApplicationDO;
+import cn.iocoder.yudao.module.hrm.dal.dataobject.employee.HrmEmployeeDO;
import cn.iocoder.yudao.module.hrm.dal.mysql.approval.HrmTransferApplicationMapper;
+import cn.iocoder.yudao.module.hrm.dal.mysql.employee.HrmEmployeeMapper;
import cn.iocoder.yudao.module.hrm.dal.redis.HrmNoRedisDAO;
import cn.iocoder.yudao.module.hrm.enums.HrmAuditStatusEnum;
import cn.iocoder.yudao.module.hrm.enums.HrmTransferTypeEnum;
@@ -60,6 +63,8 @@
@Resource
private HrmTransferApplicationMapper transferApplicationMapper;
@Resource
+ private HrmEmployeeMapper employeeMapper;
+ @Resource
private HrmNoRedisDAO noRedisDAO;
@Resource
private DeptApi deptApi;
@@ -87,6 +92,7 @@
if (Objects.equals(createReqVO.getTargetPostId(), createReqVO.getCurrentPostId())) {
throw exception(TRANSFER_APPLICATION_SAME_POST);
}
+ validateTargetDeptAndPost(createReqVO.getTargetDeptId(), createReqVO.getTargetPostId());
// 3. 纭畾琚皟宀楀憳宸ワ紙鏈寚瀹氭椂榛樿褰撳墠鐧诲綍鐢ㄦ埛锛�
Long userId = createReqVO.getUserId() != null ? createReqVO.getUserId() : getLoginUserId();
AdminUserRespDTO user = userId != null ? adminUserApi.getUser(userId) : null;
@@ -99,6 +105,7 @@
throw new ServiceException(TRANSFER_APPLICATION_APPLICANT_DEPT_EMPTY.getCode(),
String.format("璋冨矖鐢宠澶辫触锛氬憳宸%s]鏈缃儴闂紝鏃犳硶纭畾鍘熼儴闂ㄣ�傝鍏堝埌銆屽憳宸ョ鐞嗐�嶇紪杈戣鍛樺伐妗f琛ュ叏閮ㄩ棬锛屽啀閲嶆柊鍙戣捣璋冨矖鐢宠銆�", user.getNickname()));
}
+ validateCurrentDept(userId, createReqVO.getCurrentDeptId());
if (createReqVO.getCurrentPostId() == null) {
throw new ServiceException(TRANSFER_APPLICATION_APPLICANT_POST_EMPTY.getCode(),
String.format("璋冨矖鐢宠澶辫触锛氬憳宸%s]鏈缃矖浣嶏紝鏃犳硶纭畾鍘熷矖浣嶃�傝鍏堝埌銆屽憳宸ョ鐞嗐�嶇紪杈戣鍛樺伐妗f琛ュ叏宀椾綅锛屽啀閲嶆柊鍙戣捣璋冨矖鐢宠銆�", user.getNickname()));
@@ -131,9 +138,13 @@
@Override
public void updateTransferApplication(HrmTransferApplicationSaveReqVO updateReqVO) {
HrmTransferApplicationDO application = validateTransferApplicationExists(updateReqVO.getId());
+ validateOperator(application, getLoginUserId());
if (!Objects.equals(application.getStatus(), HrmAuditStatusEnum.DRAFT.getStatus())
- && !Objects.equals(application.getStatus(), HrmAuditStatusEnum.PROCESS.getStatus())) {
- throw exception(TRANSFER_APPLICATION_UPDATE_FAIL_NOT_DRAFT);
+ && !Objects.equals(application.getStatus(), HrmAuditStatusEnum.REJECT.getStatus())) {
+ throw exception(TRANSFER_APPLICATION_UPDATE_FAIL_NOT_EDITABLE);
+ }
+ if (updateReqVO.getUserId() != null && !Objects.equals(updateReqVO.getUserId(), application.getUserId())) {
+ throw exception(TRANSFER_APPLICATION_APPLICANT_IMMUTABLE);
}
if (Objects.equals(updateReqVO.getTargetDeptId(), updateReqVO.getCurrentDeptId())) {
throw exception(TRANSFER_APPLICATION_SAME_DEPT);
@@ -141,7 +152,11 @@
if (Objects.equals(updateReqVO.getTargetPostId(), updateReqVO.getCurrentPostId())) {
throw exception(TRANSFER_APPLICATION_SAME_POST);
}
+ validateTargetDeptAndPost(updateReqVO.getTargetDeptId(), updateReqVO.getTargetPostId());
+ validateCurrentDept(application.getUserId(),
+ updateReqVO.getCurrentDeptId() != null ? updateReqVO.getCurrentDeptId() : application.getCurrentDeptId());
HrmTransferApplicationDO updateObj = BeanUtils.toBean(updateReqVO, HrmTransferApplicationDO.class);
+ updateObj.setUserId(null);
transferApplicationMapper.updateById(updateObj);
storageAttachmentApi.updateAttachments("file", "hrm_transfer_application", updateReqVO.getId(), updateReqVO.getBlobIds());
}
@@ -149,6 +164,7 @@
@Override
public void deleteTransferApplication(Long id) {
HrmTransferApplicationDO application = validateTransferApplicationExists(id);
+ validateOperator(application, getLoginUserId());
if (!Objects.equals(application.getStatus(), HrmAuditStatusEnum.DRAFT.getStatus())) {
throw exception(TRANSFER_APPLICATION_UPDATE_FAIL_NOT_DRAFT);
}
@@ -263,9 +279,13 @@
@Transactional(rollbackFor = Exception.class)
public void submitTransferApplication(Long id, String processDefinitionKey, Long userId) {
HrmTransferApplicationDO application = validateTransferApplicationExists(id);
- if (ObjUtil.notEqual(application.getStatus(), HrmAuditStatusEnum.DRAFT.getStatus())) {
+ validateOperator(application, userId);
+ if (ObjUtil.notEqual(application.getStatus(), HrmAuditStatusEnum.DRAFT.getStatus())
+ && ObjUtil.notEqual(application.getStatus(), HrmAuditStatusEnum.REJECT.getStatus())) {
throw exception(TRANSFER_APPLICATION_SUBMIT_FAIL_NOT_DRAFT);
}
+ validateTargetDeptAndPost(application.getTargetDeptId(), application.getTargetPostId());
+ validateCurrentDept(application.getUserId(), application.getCurrentDeptId());
// 鍏ㄥ眬鍏嶅鎵癸細涓氬姟鏍¢獙閫氳繃鍚庣洿鎺ユ墽琛屽鎵归�氳繃閫昏緫锛屾棤闇�娴佺▼妯″瀷銆�
if (bpmProcessInstanceApi.isGlobalAutoApprove()) {
transferApplicationMapper.updateById(HrmTransferApplicationDO.builder()
@@ -278,17 +298,45 @@
}
validateApproveCategoryAndProcessDefinition();
- ProcessDefinition processDefinition = bpmProcessDefinitionService.getActiveProcessDefinition(processDefinitionKey);
- if (processDefinition == null) {
+ if (processDefinitionKey == null || processDefinitionKey.isBlank()) {
throw exception(TRANSFER_APPLICATION_BPM_PROCESS_DEFINITION_NOT_EXISTS);
}
- String processInstanceId = bpmProcessInstanceApi.createProcessInstance(userId, new BpmProcessInstanceCreateReqDTO()
- .setProcessDefinitionKey(processDefinitionKey).setBusinessKey(String.valueOf(id)));
- transferApplicationMapper.updateById(HrmTransferApplicationDO.builder()
- .id(id)
- .processInstanceId(processInstanceId)
- .status(HrmAuditStatusEnum.PROCESS.getStatus())
- .build());
+ ProcessDefinition processDefinition = bpmProcessDefinitionService.getActiveProcessDefinition(processDefinitionKey);
+ if (processDefinition == null || bpmProcessDefinitionService
+ .getProcessDefinitionInfoListByCategory(APPROVE_CATEGORY_CODE).stream()
+ .noneMatch(info -> Objects.equals(info.getProcessDefinitionId(), processDefinition.getId()))) {
+ throw exception(TRANSFER_APPLICATION_BPM_PROCESS_DEFINITION_NOT_EXISTS);
+ }
+ String processInstanceId = bpmProcessInstanceApi.createProcessInstance(application.getUserId(), new BpmProcessInstanceCreateReqDTO()
+ .setProcessDefinitionKey(processDefinitionKey).setBusinessKey(String.valueOf(id))
+ .setVariables(Map.of("businessNo", application.getNo())));
+ transferApplicationMapper.update(null, new LambdaUpdateWrapper<HrmTransferApplicationDO>()
+ .eq(HrmTransferApplicationDO::getId, id)
+ .set(HrmTransferApplicationDO::getProcessInstanceId, processInstanceId)
+ .set(HrmTransferApplicationDO::getStatus, HrmAuditStatusEnum.PROCESS.getStatus())
+ .set(HrmTransferApplicationDO::getApproveTime, null));
+ }
+
+ private void validateTargetDeptAndPost(Long targetDeptId, Long targetPostId) {
+ deptApi.validateDeptList(Collections.singletonList(targetDeptId));
+ postApi.validPostList(Collections.singletonList(targetPostId));
+ }
+
+ private void validateOperator(HrmTransferApplicationDO application, Long operatorId) {
+ if (!Objects.equals(application.getUserId(), operatorId)
+ && !Objects.equals(application.getCreator(), String.valueOf(operatorId))) {
+ throw exception(TRANSFER_APPLICATION_OPERATOR_NOT_ALLOWED);
+ }
+ }
+
+ private void validateCurrentDept(Long userId, Long currentDeptId) {
+ HrmEmployeeDO employee = employeeMapper.selectByUserId(userId);
+ if (employee == null || employee.getDeptId() == null) {
+ throw exception(TRANSFER_APPLICATION_EMPLOYEE_DEPT_NOT_FOUND);
+ }
+ if (!Objects.equals(employee.getDeptId(), currentDeptId)) {
+ throw exception(TRANSFER_APPLICATION_CURRENT_DEPT_MISMATCH);
+ }
}
private void validateApproveCategoryAndProcessDefinition() {
@@ -344,11 +392,12 @@
log.error("[updateTransferApplicationAuditStatus][application({}) 涓嶅浜庡鎵逛腑锛屾棤娉曟洿鏂板鎵圭粨鏋�({})]", id, status);
throw exception(TRANSFER_APPLICATION_UPDATE_AUDIT_STATUS_FAIL_NOT_PROCESS);
}
- transferApplicationMapper.updateById(HrmTransferApplicationDO.builder()
- .id(id)
- .status(status)
- .approveTime(java.time.LocalDateTime.now())
- .build());
+ transferApplicationMapper.update(null, new LambdaUpdateWrapper<HrmTransferApplicationDO>()
+ .eq(HrmTransferApplicationDO::getId, id)
+ .set(HrmTransferApplicationDO::getStatus, status)
+ .set(HrmTransferApplicationDO::getApproveTime,
+ Objects.equals(status, HrmAuditStatusEnum.APPROVE.getStatus())
+ ? java.time.LocalDateTime.now() : null));
}
@Override
@@ -356,4 +405,4 @@
return transferApplicationMapper.selectByProcessInstanceId(processInstanceId);
}
-}
\ No newline at end of file
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/itemreceipt/vo/MesWmItemReceiptRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/itemreceipt/vo/MesWmItemReceiptRespVO.java
index f5437af..843e8f5 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/itemreceipt/vo/MesWmItemReceiptRespVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/itemreceipt/vo/MesWmItemReceiptRespVO.java
@@ -60,6 +60,10 @@
@Schema(description = "BPM 娴佺▼瀹炰緥缂栧彿", example = "xxx")
private String processInstanceId;
+ @Schema(description = "瀹℃壒閫氳繃鏃堕棿")
+ @ExcelProperty("瀹℃壒閫氳繃鏃堕棿")
+ private LocalDateTime approveTime;
+
@Schema(description = "澶囨敞", example = "澶囨敞")
@ExcelProperty("澶囨敞")
private String remark;
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/itemreceipt/MesWmItemReceiptDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/itemreceipt/MesWmItemReceiptDO.java
index f641a4d..ec5457b 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/itemreceipt/MesWmItemReceiptDO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/itemreceipt/MesWmItemReceiptDO.java
@@ -88,6 +88,8 @@
* BPM 娴佺▼瀹氫箟 Key
*/
private String processDefinitionKey;
+ /** 瀹℃壒閫氳繃鏃堕棿锛涢┏鍥炴垨鎾ら攢鏃朵负绌恒�� */
+ private LocalDateTime approveTime;
/**
* 澶囨敞
*/
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 509733b..1184bfc 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
@@ -354,6 +354,10 @@
"宸ュ簭銆寋}銆嶆寜璁℃椂璁¤柂锛岃濉啓鏈鎶ュ伐宸ユ椂锛堝皬鏃讹級锛屽伐鏃跺繀椤诲ぇ浜� 0锛涜嫢瀹為檯鎸夋暟閲忚钖紝璇峰厛鎶婅宸ュ簭鐨勮璐圭被鍨嬫敼涓鸿浠�");
ErrorCode PRO_FEEDBACK_TIME_BILLING_QUICK_UNSUPPORTED = new ErrorCode(1_040_506_020,
"宸ュ簭銆寋}銆嶆寜璁℃椂璁¤柂锛屽揩鎹锋姤宸ユ棤娉曞綍鍏ュ伐鏃讹紙灏忔椂锛夛紱璇峰埌銆岀敓浜ф姤宸ャ�嶉〉闈㈡柊澧炴姤宸ュ苟濉啓宸ユ椂");
+ ErrorCode PRO_FEEDBACK_APPROVAL_PROCESS_KEY_REQUIRED = new ErrorCode(1_040_506_021,
+ "宸ュ崟宸插紑鍚姤宸ュ鎵癸紝浣嗘湭閰嶇疆瀹℃壒娴佺▼锛岃鍏堜负宸ュ崟閰嶇疆娴佺▼鍚庡啀鎻愪氦鎶ュ伐");
+ ErrorCode PRO_FEEDBACK_APPROVAL_PROCESS_KEY_INVALID = new ErrorCode(1_040_506_022,
+ "宸ュ崟閰嶇疆鐨勬姤宸ュ鎵规祦绋嬫湭婵�娲绘垨涓嶅睘浜庢姤宸ュ鎵瑰垎绫伙紝璇锋鏌ュ伐鍗曞鎵归厤缃�");
// ========== MES 鐢熶骇绠$悊-杈呭姪宸ユ椂閰嶇疆锛�1-040-510-000锛� ==========
ErrorCode PRO_WORKTIME_AUX_NOT_EXISTS = new ErrorCode(1_040_510_000, "杈呭姪宸ユ椂椤圭洰涓嶅瓨鍦�");
@@ -590,6 +594,7 @@
ErrorCode WM_ITEM_RECEIPT_STATUS_ERROR = new ErrorCode(1_040_705_005, "鍏ュ簱鍗曠姸鎬佷笉姝g‘");
ErrorCode WM_ITEM_RECEIPT_CANCEL_NOT_ALLOWED = new ErrorCode(1_040_705_006, "宸插畬鎴愭垨宸插彇娑堢殑鍏ュ簱鍗曚笉鍏佽鍙栨秷");
ErrorCode WM_ITEM_RECEIPT_ALREADY_EXISTS = new ErrorCode(1_040_705_007, "璇ュ埌璐ч�氱煡鍗曞凡鐢熸垚鍏ュ簱鍗曪紝涓嶈兘閲嶅鐢熸垚");
+ ErrorCode WM_ITEM_RECEIPT_BPM_PROCESS_DEFINITION_NOT_EXISTS = new ErrorCode(1_040_705_008, "閲囪喘鍏ュ簱瀹℃壒娴佺▼鏈厤缃垨鎵�閫夋祦绋嬩笉灞炰簬閲囪喘鍏ュ簱瀹℃壒");
ErrorCode WM_PURCHASE_ORDER_NOT_EXISTS = new ErrorCode(1_040_705_008, "閲囪喘璁㈠崟涓嶅瓨鍦�");
ErrorCode WM_PURCHASE_ORDER_NO_ITEM = new ErrorCode(1_040_705_008, "閲囪喘璁㈠崟鏃犳槑缁嗘暟鎹�");
ErrorCode WM_ITEM_RECEIPT_LINE_NOT_EXISTS = new ErrorCode(1_040_705_100, "閲囪喘鍏ュ簱鍗曡涓嶅瓨鍦�");
@@ -854,6 +859,7 @@
ErrorCode WM_SALES_NOTICE_SUBMIT_PROCESS_KEY_REQUIRED = new ErrorCode(1_040_720_020, "鎻愪氦鍙戣揣瀹℃壒鍓嶅繀椤婚�夋嫨瀹℃壒娴佺▼锛氭湭浼犳祦绋嬪畾涔� Key");
ErrorCode WM_SALES_NOTICE_BPM_PROCESS_DEFINITION_NOT_EXISTS = new ErrorCode(1_040_720_021, "鍙戣揣瀹℃壒娴佺▼鏈厤缃細璇峰厛鍦ㄣ�屾祦绋嬬鐞嗐�嶄腑璁捐骞跺惎鐢ㄣ�屽彂璐у鎵广�嶆祦绋嬶紝鍐嶆彁浜ゅ彂璐у崟");
ErrorCode WM_SALES_NOTICE_UPDATE_AUDIT_STATUS_FAIL_NOT_APPROVING = new ErrorCode(1_040_720_022, "鍙戣揣鍗�({})褰撳墠鐘舵�佷负[{}]锛屼笉澶勪簬瀹℃壒涓紝鏃犳硶鏇存柊瀹℃壒缁撴灉");
+ ErrorCode WM_SALES_NOTICE_STATUS_NOT_ALLOW_SUBMIT = new ErrorCode(1_040_720_023, "鍙湁鑽夌鐘舵�佺殑鍙戣揣閫氱煡鍗曟墠鑳芥彁浜ゅ鎵�");
// ========== MES 浠撳簱绠$悊-鏉$爜閰嶇疆锛�1-040-730-000锛� ==========
ErrorCode WM_BARCODE_CONFIG_NOT_EXISTS = new ErrorCode(1_040_730_000, "鏉$爜閰嶇疆涓嶅瓨鍦�");
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 ded280e..b097178 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
@@ -4,11 +4,14 @@
import cn.hutool.core.util.ObjUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import cn.iocoder.yudao.framework.common.exception.ServiceException;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
import cn.iocoder.yudao.framework.common.util.json.JsonUtils;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.module.bpm.service.definition.BpmProcessDefinitionService;
+import org.flowable.engine.repository.ProcessDefinition;
import cn.iocoder.yudao.module.mes.controller.admin.pro.feedback.vo.*;
import cn.iocoder.yudao.module.mes.enums.MesBizTypeConstants;
import cn.iocoder.yudao.module.mes.enums.md.autocode.MesMdAutoCodeRuleCodeEnum;
@@ -76,6 +79,7 @@
import java.util.List;
import java.util.LinkedHashSet;
import java.util.Map;
+import java.util.Objects;
import java.util.Set;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
@@ -90,6 +94,8 @@
@Validated
@lombok.extern.slf4j.Slf4j
public class MesProFeedbackServiceImpl implements MesProFeedbackService {
+
+ private static final String FEEDBACK_APPROVE_CATEGORY_CODE = "mes_pro_feedback_audit";
@Resource
private MesProFeedbackEquipmentService equipmentService;
@@ -147,6 +153,8 @@
private MdmItemBatchConfigApi itemBatchConfigApi;
@Resource
private cn.iocoder.yudao.module.bpm.api.task.BpmProcessInstanceApi processInstanceApi;
+ @Resource
+ private BpmProcessDefinitionService bpmProcessDefinitionService;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -267,16 +275,28 @@
}
MesProWorkOrderDO workOrder = workOrderService.getWorkOrder(feedback.getWorkOrderId());
+ if (workOrder != null && Boolean.TRUE.equals(workOrder.getFeedbackApprove())
+ && StrUtil.isBlank(workOrder.getProcessDefinitionKey())) {
+ throw exception(PRO_FEEDBACK_APPROVAL_PROCESS_KEY_REQUIRED);
+ }
// 1.2 鎶ュ伐涓庤川妫�鍒嗙锛氭彁浜ゆ姤宸ヤ笉鍐嶈嚜鍔ㄧ敓鎴愯繃绋嬫楠屽崟锛岃川妫�鐢辫川妫�閮ㄩ棬鎵嬪伐寤哄崟
if (!processInstanceApi.isGlobalAutoApprove() && workOrder != null
&& Boolean.TRUE.equals(workOrder.getFeedbackApprove())
- && cn.hutool.core.util.StrUtil.isNotBlank(workOrder.getProcessDefinitionKey())) {
+ && StrUtil.isNotBlank(workOrder.getProcessDefinitionKey())) {
+ ProcessDefinition processDefinition = bpmProcessDefinitionService
+ .getActiveProcessDefinition(workOrder.getProcessDefinitionKey());
+ if (processDefinition == null || bpmProcessDefinitionService
+ .getProcessDefinitionInfoListByCategory(FEEDBACK_APPROVE_CATEGORY_CODE).stream()
+ .noneMatch(info -> Objects.equals(info.getProcessDefinitionId(), processDefinition.getId()))) {
+ throw exception(PRO_FEEDBACK_APPROVAL_PROCESS_KEY_INVALID);
+ }
// 2. 鏇存柊鐘舵�佷负瀹℃壒涓紝骞跺惎鍔ㄦ祦绋�
String processInstanceId = processInstanceApi.createProcessInstance(cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId(),
new cn.iocoder.yudao.module.bpm.api.task.dto.BpmProcessInstanceCreateReqDTO()
.setProcessDefinitionKey(workOrder.getProcessDefinitionKey())
- .setBusinessKey(String.valueOf(id)));
+ .setBusinessKey(String.valueOf(id))
+ .setVariables(Map.of("businessNo", feedback.getCode())));
feedbackMapper.updateById(new MesProFeedbackDO().setId(id)
.setStatus(MesProFeedbackStatusEnum.APPROVING.getStatus())
@@ -292,8 +312,11 @@
}
// 3. 鏇存柊鐘舵�佷负瀹℃壒涓紝鐒跺悗鐩存帴閫氳繃瀹℃壒
- feedbackMapper.updateById(new MesProFeedbackDO().setId(id)
- .setStatus(MesProFeedbackStatusEnum.APPROVING.getStatus()));
+ feedbackMapper.update(null, new LambdaUpdateWrapper<MesProFeedbackDO>()
+ .eq(MesProFeedbackDO::getId, id)
+ .set(MesProFeedbackDO::getStatus, MesProFeedbackStatusEnum.APPROVING.getStatus())
+ .set(MesProFeedbackDO::getProcessInstanceId, null)
+ .set(MesProFeedbackDO::getProcessDefinitionKey, null));
MesProFeedbackApproveReqVO approveReqVO = cn.iocoder.yudao.framework.common.util.object.BeanUtils.toBean(reqVO, MesProFeedbackApproveReqVO.class);
// 鑷姩瀹℃壒锛氳繃绋嬫楠屽崟鍒氱敓鎴愬皻鏈~鍐欙紝涓嶅仛璐ㄦ宸ヨ祫鍓嶇疆鏍¢獙锛堣川閲忚皟鏁寸暀绌猴級
approveFeedback(approveReqVO, false);
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 4346163..db3c34c 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
@@ -2,6 +2,8 @@
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ObjUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
@@ -25,26 +27,29 @@
import cn.iocoder.yudao.module.mes.service.wm.transaction.dto.MesWmTransactionSaveReqDTO;
import cn.iocoder.yudao.module.bpm.api.task.BpmProcessInstanceApi;
import cn.iocoder.yudao.module.bpm.api.task.dto.BpmProcessInstanceCreateReqDTO;
+import cn.iocoder.yudao.module.bpm.service.definition.BpmProcessDefinitionService;
import cn.iocoder.yudao.module.erp.api.purchase.ErpPurchaseOrderApi;
import cn.iocoder.yudao.module.srm.api.supplier.SrmSupplierApi;
import cn.iocoder.yudao.module.mdm.api.item.MdmItemApi;
import cn.iocoder.yudao.module.mdm.api.item.dto.MdmItemRespDTO;
-import org.springframework.security.core.Authentication;
-import org.springframework.security.core.context.SecurityContextHolder;
import jakarta.annotation.Resource;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated;
+import org.flowable.engine.repository.ProcessDefinition;
import lombok.extern.slf4j.Slf4j;
import java.math.BigDecimal;
+import java.time.LocalDateTime;
import java.util.Collection;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList;
+import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.*;
/**
@@ -54,6 +59,8 @@
@Validated
@Slf4j
public class MesWmItemReceiptServiceImpl implements MesWmItemReceiptService {
+
+ private static final String ITEM_RECEIPT_APPROVE_CATEGORY_CODE = "item_receipt_approve";
@Resource
private MesWmItemReceiptMapper itemReceiptMapper;
@@ -79,6 +86,8 @@
@Resource
private BpmProcessInstanceApi processInstanceApi;
+ @Resource
+ private BpmProcessDefinitionService bpmProcessDefinitionService;
@Resource
private ErpPurchaseOrderApi purchaseOrderApi;
@@ -465,7 +474,12 @@
@Transactional(rollbackFor = Exception.class)
public void submitItemReceiptApproval(Long id, String processDefinitionKey) {
// 1. 鏍¢獙瀛樺湪 + 鑽夌鐘舵��
- validateItemReceiptExistsAndDraft(id);
+ MesWmItemReceiptDO receipt = validateItemReceiptExistsAndDraft(id);
+ // 瀹℃壒鍏ュ彛涓庢櫘閫氭彁浜ゅ叆鍙d繚鎸佷竴鑷达紝绌鸿鍗曟嵁涓嶈兘杩涘叆瀹℃壒銆�
+ List<MesWmItemReceiptLineDO> lines = itemReceiptLineService.getItemReceiptLineListByReceiptId(id);
+ if (CollUtil.isEmpty(lines)) {
+ throw exception(WM_ITEM_RECEIPT_NO_LINE);
+ }
// 2. 鍒涘缓 BPM 娴佺▼瀹炰緥
Long userId = getCurrentUserId();
@@ -479,10 +493,21 @@
return;
}
+ if (StrUtil.isBlank(processDefinitionKey)) {
+ throw exception(WM_ITEM_RECEIPT_BPM_PROCESS_DEFINITION_NOT_EXISTS);
+ }
+ ProcessDefinition processDefinition = bpmProcessDefinitionService.getActiveProcessDefinition(processDefinitionKey);
+ if (processDefinition == null || bpmProcessDefinitionService
+ .getProcessDefinitionInfoListByCategory(ITEM_RECEIPT_APPROVE_CATEGORY_CODE).stream()
+ .noneMatch(info -> Objects.equals(info.getProcessDefinitionId(), processDefinition.getId()))) {
+ throw exception(WM_ITEM_RECEIPT_BPM_PROCESS_DEFINITION_NOT_EXISTS);
+ }
+
String processInstanceId = processInstanceApi.createProcessInstance(userId,
new BpmProcessInstanceCreateReqDTO()
.setProcessDefinitionKey(processDefinitionKey)
- .setBusinessKey(String.valueOf(id)));
+ .setBusinessKey(String.valueOf(id))
+ .setVariables(Map.of("businessNo", receipt.getCode())));
// 3. 鏇存柊鍏ュ簱鍗曠姸鎬佷负瀹℃壒涓�
itemReceiptMapper.updateById(new MesWmItemReceiptDO()
@@ -504,8 +529,11 @@
// 2. 鏍规嵁瀹℃壒缁撴灉鏇存柊鐘舵��
Integer newStatus = convertBpmResultToReceiptStatus(bpmResult);
if (newStatus != null) {
- itemReceiptMapper.updateById(new MesWmItemReceiptDO()
- .setId(id).setStatus(newStatus));
+ itemReceiptMapper.update(null, new LambdaUpdateWrapper<MesWmItemReceiptDO>()
+ .eq(MesWmItemReceiptDO::getId, id)
+ .set(MesWmItemReceiptDO::getStatus, newStatus)
+ .set(MesWmItemReceiptDO::getApproveTime,
+ BpmTaskStatusEnum.APPROVE.getStatus().equals(bpmResult) ? LocalDateTime.now() : null));
}
}
@@ -527,11 +555,7 @@
* 鑾峰彇褰撳墠鐢ㄦ埛 ID
*/
private Long getCurrentUserId() {
- Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
- if (authentication != null && authentication.getPrincipal() instanceof Long) {
- return (Long) authentication.getPrincipal();
- }
- return 1L; // 榛樿鐢ㄦ埛
+ return Objects.requireNonNull(getLoginUserId(), "閲囪喘鍏ュ簱瀹℃壒闇�瑕佺櫥褰曠敤鎴�");
}
/**
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/salesnotice/MesWmSalesNoticeServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/salesnotice/MesWmSalesNoticeServiceImpl.java
index 7745b64..786327d 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/salesnotice/MesWmSalesNoticeServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/salesnotice/MesWmSalesNoticeServiceImpl.java
@@ -44,6 +44,7 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
import java.util.Set;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
@@ -142,7 +143,10 @@
@Transactional(rollbackFor = Exception.class)
public void submitSalesNotice(Long id, String processDefinitionKey, Long userId) {
// 1.1 鏍¢獙瀛樺湪 + 鑽夌鐘舵��
- MesWmSalesNoticeDO notice = validateSalesNoticeExistsAndDraft(id);
+ MesWmSalesNoticeDO notice = validateSalesNoticeExists(id);
+ if (ObjUtil.notEqual(PREPARE.getStatus(), notice.getStatus())) {
+ throw exception(WM_SALES_NOTICE_STATUS_NOT_ALLOW_SUBMIT);
+ }
// 1.2 妫�鏌ユ槸鍚︽湁琛岄」鐩�
List<MesWmSalesNoticeLineDO> lines = salesNoticeLineService.getSalesNoticeLineListByNoticeId(id);
if (CollUtil.isEmpty(lines)) {
@@ -163,13 +167,16 @@
}
validateSalesNoticeApproveCategoryAndProcessDefinition();
ProcessDefinition processDefinition = bpmProcessDefinitionService.getActiveProcessDefinition(processDefinitionKey);
- if (processDefinition == null) {
+ if (processDefinition == null || bpmProcessDefinitionService
+ .getProcessDefinitionInfoListByCategory(SALES_DELIVERY_APPROVE_CATEGORY_CODE).stream()
+ .noneMatch(info -> Objects.equals(info.getProcessDefinitionId(), processDefinition.getId()))) {
throw exception(WM_SALES_NOTICE_BPM_PROCESS_DEFINITION_NOT_EXISTS);
}
// 4. 鍒涘缓瀹℃壒娴佺▼瀹炰緥锛岃繘鍏ュ鎵逛腑
String processInstanceId = bpmProcessInstanceApi.createProcessInstance(userId, new BpmProcessInstanceCreateReqDTO()
- .setProcessDefinitionKey(processDefinitionKey).setBusinessKey(String.valueOf(id)));
+ .setProcessDefinitionKey(processDefinitionKey).setBusinessKey(String.valueOf(id))
+ .setVariables(Map.of("businessNo", notice.getCode())));
salesNoticeMapper.updateById(new MesWmSalesNoticeDO()
.setId(id).setProcessInstanceId(processInstanceId).setStatus(APPROVING.getStatus()));
}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/scrap/MesWmScrapSaleService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/scrap/MesWmScrapSaleService.java
index 47f5e76..f0b648d 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/scrap/MesWmScrapSaleService.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/scrap/MesWmScrapSaleService.java
@@ -46,7 +46,7 @@
saleMapper.updateById(update);
String processId = processApi.createProcessInstance(userId, new BpmProcessInstanceCreateReqDTO()
.setProcessDefinitionKey(PROCESS_KEY).setBusinessKey(String.valueOf(id))
- .setVariables(Map.of("saleCode", sale.getCode(), "buyer", sale.getBuyer(),
+ .setVariables(Map.of("businessNo", sale.getCode(), "saleCode", sale.getCode(), "buyer", sale.getBuyer(),
"totalAmount", lines.stream().map(line -> line.getQuantity().multiply(line.getUnitPrice()))
.reduce(BigDecimal.ZERO, BigDecimal::add))));
MesWmScrapSaleDO processUpdate = new MesWmScrapSaleDO();
--
Gitblit v1.9.3