From e09f103259fa602382bb5ce2a03361a6397af46a Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 15 十月 2026 11:49:15 +0800
Subject: [PATCH] feat(mes): 优化MES模块生产调度与数据管理功能
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/task/MesProTaskServiceImpl.java | 149 ++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 144 insertions(+), 5 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/task/MesProTaskServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/task/MesProTaskServiceImpl.java
index d6ebc52..087ce58 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/task/MesProTaskServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/task/MesProTaskServiceImpl.java
@@ -12,6 +12,7 @@
import cn.iocoder.yudao.module.mes.dal.dataobject.md.unitmeasure.MesMdUnitMeasureDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.md.workstation.MesMdWorkstationMachineDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.task.MesProTaskDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.pro.process.MesProProcessParamDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.workorder.MesProWorkOrderDO;
import cn.iocoder.yudao.module.mes.dal.mysql.pro.task.MesProTaskMapper;
import cn.iocoder.yudao.module.mes.dal.mysql.pro.feedback.MesProFeedbackMapper;
@@ -24,6 +25,7 @@
import cn.iocoder.yudao.module.mes.service.md.workstation.MesMdWorkstationMachineService;
import cn.iocoder.yudao.module.mes.service.md.workstation.MesMdWorkstationService;
import cn.iocoder.yudao.module.mes.service.pro.process.MesProProcessService;
+import cn.iocoder.yudao.module.mes.service.pro.process.MesProProcessParamService;
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.route.MesProRouteProcessDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.route.MesProRouteDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.route.MesProRouteProductDO;
@@ -33,6 +35,7 @@
import cn.iocoder.yudao.module.mes.service.pro.workorder.MesProWorkOrderService;
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.workorder.MesProWorkOrderProcessDO;
import cn.iocoder.yudao.module.mes.service.pro.workorder.MesProWorkOrderProcessService;
+import cn.iocoder.yudao.module.mes.service.pro.workorder.MesProWorkOrderParamRecordService;
import jakarta.annotation.Resource;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
@@ -58,6 +61,8 @@
import cn.iocoder.yudao.framework.common.util.object.ObjectUtils;
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.task.MesProTaskPauseRecordDO;
import cn.iocoder.yudao.module.mes.dal.mysql.pro.task.MesProTaskPauseRecordMapper;
+import cn.iocoder.yudao.module.mes.dal.dataobject.pro.task.MesProTaskAssigneeDO;
+import cn.iocoder.yudao.module.mes.dal.mysql.pro.task.MesProTaskAssigneeMapper;
import cn.iocoder.yudao.module.mes.controller.admin.pro.task.vo.MesProTaskPauseReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.pro.task.vo.MesProTaskResumeReqVO;
@@ -71,6 +76,12 @@
public class MesProTaskServiceImpl implements MesProTaskService {
@Resource
+ private cn.iocoder.yudao.module.mes.service.pro.task.schedule.MesProScheduleGuardService scheduleGuard;
+
+ @Resource
+ private cn.iocoder.yudao.module.mes.dal.mysql.pro.workorder.MesProWorkOrderMapper scheduleWorkOrderMapper;
+
+ @Resource
private MesProTaskMapper taskMapper;
@Resource
@@ -78,6 +89,9 @@
@Resource
private MesProTaskPauseRecordMapper taskPauseRecordMapper;
+
+ @Resource
+ private MesProTaskAssigneeMapper taskAssigneeMapper;
@Resource
@Lazy
@@ -102,6 +116,12 @@
@Lazy
private MesProWorkOrderProcessService workOrderProcessService;
@Resource
+ @Lazy
+ private MesProWorkOrderParamRecordService workOrderParamRecordService;
+ @Resource
+ @Lazy
+ private MesProProcessParamService processParamService;
+ @Resource
private MesMdAutoCodeRecordService autoCodeRecordService;
@Resource
private MesMdWorkstationMachineService workstationMachineService;
@@ -110,10 +130,15 @@
private MesDvMachineryService machineryService;
@Override
+ @Transactional(rollbackFor = Exception.class, isolation = org.springframework.transaction.annotation.Isolation.SERIALIZABLE)
public Long createTask(MesProTaskSaveReqVO createReqVO) {
+ scheduleGuard.lock();
// 1. 鏍￠獙鍏宠仈鏁版嵁瀛樺湪
- MesProWorkOrderDO workOrder = workOrderService.validateWorkOrderExists(createReqVO.getWorkOrderId());
- workstationService.validateWorkstationExists(createReqVO.getWorkstationId());
+ MesProWorkOrderDO workOrder = workOrderService.validateWorkOrderConfirmed(createReqVO.getWorkOrderId());
+ var station = workstationService.validateWorkstationExistsAndEnable(createReqVO.getWorkstationId());
+ if (!java.util.Objects.equals(station.getProcessId(), createReqVO.getProcessId())) {
+ throw exception(cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.PRO_TASK_SCHEDULE_INVALID, "宸ヤ綔绔欎笌宸ュ簭涓嶅尮閰�");
+ }
routeService.validateRouteExists(createReqVO.getRouteId());
processService.validateProcessExistsAndEnable(createReqVO.getProcessId());
@@ -139,15 +164,40 @@
if (task.getClientId() == null && workOrder.getClientId() != null) {
task.setClientId(workOrder.getClientId());
}
+ scheduleGuard.validate(workOrder, task, null);
// 2.2 鎻掑叆
taskMapper.insert(task);
+ // 2.2.1 鍙傛暟蹇収锛氫紭鍏堜娇鐢ㄦā鏉匡紱鏃犳ā鏉挎椂鍥為��鍒板伐搴忎富鏁版嵁缁戝畾鐨勫伐鑹哄弬鏁�
+ createTaskParamRecordWithFallback(task);
+
+ // 2.3 淇濆瓨鎸囧畾鎶ュ伐浜哄憳
+ updateTaskAssignees(task.getId(), createReqVO.getAssigneeUserIds());
+ synchronizeScheduledQuantity(workOrder, task.getRouteId());
+
return task.getId();
}
+ /**
+ * 涓轰换鍔″浐鍖栧弬鏁板揩鐓э細浼樺厛浣跨敤璺嚎/宸ュ崟宸ュ簭缁戝畾鐨勫弬鏁版ā鏉匡紱鏃犳ā鏉挎椂鍥為��鍒板伐搴忎富鏁版嵁缁戝畾鐨勫伐鑹哄弬鏁�
+ */
+ private void createTaskParamRecordWithFallback(MesProTaskDO task) {
+ if (task.getParamTemplateId() != null) {
+ workOrderParamRecordService.createTaskParamRecord(task.getId(), task.getParamTemplateId());
+ return;
+ }
+ // 鏃犳ā鏉匡細浠庡伐搴忎富鏁版嵁瑙ｆ瀽缁戝畾鐨勫伐鑹哄弬鏁�
+ List<MesProProcessParamDO> processParams = processParamService.getProcessParamListByProcessId(task.getProcessId());
+ if (CollUtil.isNotEmpty(processParams)) {
+ workOrderParamRecordService.createTaskParamRecordFromProcessParams(task.getId(), processParams);
+ }
+ }
+
@Override
+ @Transactional(rollbackFor = Exception.class, isolation = org.springframework.transaction.annotation.Isolation.SERIALIZABLE)
public void updateTask(MesProTaskSaveReqVO updateReqVO) {
+ scheduleGuard.lock();
// 1.1 鏍￠獙瀛樺湪
- MesProTaskDO task = validateTaskExists(updateReqVO.getId());
+ MesProTaskDO task = validateTaskNotFinished(updateReqVO.getId());
// 1.2 鏍￠獙鍏宠仈鏁版嵁瀛樺湪
if (updateReqVO.getWorkOrderId() != null) {
workOrderService.validateWorkOrderExists(updateReqVO.getWorkOrderId());
@@ -169,10 +219,71 @@
}
BigDecimal quantity = updateReqVO.getQuantity() != null ? updateReqVO.getQuantity() : task.getQuantity();
+ MesProTaskDO candidate = BeanUtils.toBean(task, MesProTaskDO.class)
+ .setWorkOrderId(updateReqVO.getWorkOrderId() != null ? updateReqVO.getWorkOrderId() : task.getWorkOrderId())
+ .setProcessId(updateReqVO.getProcessId() != null ? updateReqVO.getProcessId() : task.getProcessId())
+ .setWorkstationId(updateReqVO.getWorkstationId() != null ? updateReqVO.getWorkstationId() : task.getWorkstationId())
+ .setQuantity(quantity)
+ .setStartTime(updateReqVO.getStartTime() != null ? updateReqVO.getStartTime() : task.getStartTime())
+ .setEndTime(updateReqVO.getEndTime() != null ? updateReqVO.getEndTime() : task.getEndTime());
+ var station = workstationService.validateWorkstationExistsAndEnable(candidate.getWorkstationId());
+ if (!java.util.Objects.equals(station.getProcessId(), candidate.getProcessId())) {
+ throw exception(cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.PRO_TASK_SCHEDULE_INVALID, "宸ヤ綔绔欎笌宸ュ簭涓嶅尮閰�");
+ }
+ scheduleGuard.validate(workOrderService.validateWorkOrderConfirmed(candidate.getWorkOrderId()), candidate, task.getId());
+
// 2. 鏇存柊
MesProTaskDO updateObj = BeanUtils.toBean(updateReqVO, MesProTaskDO.class)
.setName(buildTaskName(item, quantity));
taskMapper.updateById(updateObj);
+
+ // 3. 鏇存柊鎸囧畾鎶ュ伐浜哄憳锛堟瘮瀵规洿鏂帮級
+ updateTaskAssignees(task.getId(), updateReqVO.getAssigneeUserIds());
+ synchronizeScheduledQuantity(workOrderService.validateWorkOrderExists(candidate.getWorkOrderId()),
+ updateReqVO.getRouteId() != null ? updateReqVO.getRouteId() : task.getRouteId());
+ if (!java.util.Objects.equals(task.getWorkOrderId(), candidate.getWorkOrderId())) {
+ synchronizeScheduledQuantity(workOrderService.validateWorkOrderExists(task.getWorkOrderId()), task.getRouteId());
+ }
+ }
+
+ /** 宸ュ崟鎺掍骇閲忔寜鍚勫伐搴忕疮璁℃帓浜ч噺鐨勬渶灏忓�艰绠楋紝浠诲姟淇敼/鍒犻櫎鍚庡悓姝ワ紝閬垮厤鏃犳硶琛ユ帓銆� */
+ private void synchronizeScheduledQuantity(MesProWorkOrderDO order, Long routeId) {
+ List<MesProRouteProcessDO> required = buildRouteProcessList(routeId, order.getId());
+ List<MesProTaskDO> tasks = taskMapper.selectListByWorkOrderId(order.getId());
+ BigDecimal scheduled = order.getQuantity();
+ for (var process : required) {
+ BigDecimal amount = tasks.stream().filter(task -> java.util.Objects.equals(task.getProcessId(), process.getProcessId())
+ && !java.util.Objects.equals(task.getStatus(), MesProTaskStatusEnum.CANCELED.getStatus()))
+ .map(task -> task.getQuantity() == null ? BigDecimal.ZERO : task.getQuantity())
+ .reduce(BigDecimal.ZERO, BigDecimal::add);
+ scheduled = scheduled.min(amount);
+ }
+ scheduleWorkOrderMapper.updateById(new MesProWorkOrderDO().setId(order.getId()).setQuantityScheduled(scheduled));
+ }
+
+ private void updateTaskAssignees(Long taskId, List<Long> assigneeUserIds) {
+ if (assigneeUserIds == null) {
+ assigneeUserIds = Collections.emptyList();
+ }
+ // 1. 鏌ヨ鏁版嵁搴撲腑鍘熸湁鐨�
+ List<MesProTaskAssigneeDO> oldAssignees = taskAssigneeMapper.selectListByTaskId(taskId);
+ Set<Long> oldUserIds = convertSet(oldAssignees, MesProTaskAssigneeDO::getUserId);
+ Set<Long> newUserIds = new java.util.HashSet<>(assigneeUserIds);
+
+ // 2. 璁＄畻闇�瑕佹柊澧炵殑鍜岄渶瑕佸垹闄ょ殑
+ Set<Long> toAddUserIds = newUserIds.stream().filter(id -> !oldUserIds.contains(id)).collect(java.util.stream.Collectors.toSet());
+ Set<Long> toRemoveUserIds = oldUserIds.stream().filter(id -> !newUserIds.contains(id)).collect(java.util.stream.Collectors.toSet());
+
+ // 3. 鏂板
+ if (CollUtil.isNotEmpty(toAddUserIds)) {
+ List<MesProTaskAssigneeDO> addList = convertList(toAddUserIds, userId -> new MesProTaskAssigneeDO().setTaskId(taskId).setUserId(userId));
+ taskAssigneeMapper.insertBatch(addList);
+ }
+
+ // 4. 鍒犻櫎
+ if (CollUtil.isNotEmpty(toRemoveUserIds)) {
+ taskAssigneeMapper.deleteByTaskIdAndUserIds(taskId, toRemoveUserIds);
+ }
}
/**
@@ -220,6 +331,7 @@
result.add(new MesProRouteProcessDO()
.setRouteId(routeId)
.setProcessId(wp.getProcessId())
+ .setParamTemplateId(wp.getParamTemplateId())
.setSort(wp.getSort())
.setKeyFlag(wp.getKeyFlag())
.setCheckFlag(wp.getCheckFlag())
@@ -238,15 +350,20 @@
}
@Override
+ @Transactional(rollbackFor = Exception.class)
public void deleteTask(Long id) {
+ scheduleGuard.lock();
// 1. 鏍￠獙瀛樺湪涓旈潪缁堟��
- validateTaskNotFinished(id);
+ MesProTaskDO task = validateTaskNotFinished(id);
// 2. 鏍￠獙浠诲姟涓嬫棤鎶ュ伐璁板綍锛岄伩鍏嶅垹闄ゅ悗鎶ュ伐杩芥函鏂摼
if (feedbackMapper.selectCountByTaskId(id) > 0) {
throw exception(PRO_TASK_HAS_FEEDBACK);
}
- // 3. 鍒犻櫎
+ // 3. 鍒犻櫎浠诲姟涓昏〃
taskMapper.deleteById(id);
+ // 4. 鍒犻櫎鍏宠仈鐨勪汉鍛�
+ taskAssigneeMapper.deleteByTaskId(id);
+ synchronizeScheduledQuantity(workOrderService.validateWorkOrderExists(task.getWorkOrderId()), task.getRouteId());
}
@Override
@@ -270,6 +387,14 @@
return Collections.emptyList();
}
return taskMapper.selectListByWorkOrderIds(workOrderIds);
+ }
+
+ @Override
+ public List<MesProTaskAssigneeDO> getTaskAssigneeListByTaskIds(Collection<Long> taskIds) {
+ if (CollUtil.isEmpty(taskIds)) {
+ return Collections.emptyList();
+ }
+ return taskAssigneeMapper.selectListByTaskIds(taskIds);
}
@Override
@@ -337,6 +462,15 @@
validateTaskExists(id);
// 鏇存柊鏁伴噺
taskMapper.updateProducedQuantity(id, incrProducedQuantity, incrQualifyQuantity, incrUnqualifyQuantity);
+ MesProTaskDO task = taskMapper.selectById(id);
+ if (task != null) {
+ LocalDateTime now = LocalDateTime.now();
+ MesProTaskDO timeUpdate = new MesProTaskDO().setId(id).setLastFeedbackTime(now);
+ if (task.getFirstFeedbackTime() == null) {
+ timeUpdate.setFirstFeedbackTime(now);
+ }
+ taskMapper.updateById(timeUpdate);
+ }
}
@Override
@@ -402,6 +536,7 @@
@Override
@Transactional(rollbackFor = Exception.class)
public List<Long> autoGenerateTasks(MesProTaskAutoGenerateReqVO reqVO) {
+ scheduleGuard.lock();
// 1. 鏍￠獙宸ュ崟宸茬‘璁�
MesProWorkOrderDO workOrder = workOrderService.validateWorkOrderConfirmed(reqVO.getWorkOrderId());
// 2. 纭畾宸ヨ壓璺嚎锛氫紭鍏堣姹傛寚瀹� 鈫� 宸ュ崟鍏宠仈 鈫� 浜у搧鍏宠仈
@@ -430,9 +565,13 @@
.setName(buildTaskName(item, workOrder.getQuantity()))
.setCode(autoCodeRecordService.generateAutoCode(MesMdAutoCodeRuleCodeEnum.PRO_TASK_CODE.getCode()))
.setStatus(MesProTaskStatusEnum.PREPARE.getStatus())
+ .setParamTemplateId(rp.getParamTemplateId())
.setClientId(workOrder.getClientId())
.setColorCode(rp.getColorCode());
+ scheduleGuard.validate(workOrder, task, null);
taskMapper.insert(task);
+ // 鍙傛暟蹇収锛氫紭鍏堜娇鐢ㄦā鏉匡紱鏃犳ā鏉挎椂鍥為��鍒板伐搴忎富鏁版嵁缁戝畾鐨勫伐鑹哄弬鏁�
+ createTaskParamRecordWithFallback(task);
taskIds.add(task.getId());
}
// 7. 鏇存柊宸ュ崟宸叉帓浜ф暟閲�
--
Gitblit v1.9.3