From 3ff6604c75c887f4056ee03545d204bc9323286c Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 15 十月 2026 17:47:19 +0800
Subject: [PATCH] feat(mes): 新增报工设备快照功能并优化状态校验
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/task/MesProTaskServiceImpl.java | 20 ++++++++++++++++++--
1 files changed, 18 insertions(+), 2 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 087ce58..88956ea 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
@@ -76,6 +76,9 @@
public class MesProTaskServiceImpl implements MesProTaskService {
@Resource
+ private cn.iocoder.yudao.module.mes.service.pro.feedback.MesProFeedbackEquipmentService equipmentService;
+
+ @Resource
private cn.iocoder.yudao.module.mes.service.pro.task.schedule.MesProScheduleGuardService scheduleGuard;
@Resource
@@ -424,7 +427,9 @@
}
@Override
+ @Transactional(rollbackFor = Exception.class)
public void finishTaskByOrderId(Long workOrderId) {
+ equipmentService.lock();
// 1. 璇诲彇宸ュ崟涓嬫墍鏈変换鍔★紝杩囨护鎺夊凡瀹屾垚/宸插彇娑堢殑
List<MesProTaskDO> tasks = taskMapper.selectListByWorkOrderId(workOrderId);
LocalDateTime now = LocalDateTime.now();
@@ -436,10 +441,13 @@
if (CollUtil.isNotEmpty(updateList)) {
taskMapper.updateBatch(updateList);
}
+ equipmentService.afterTaskStateChanged(tasks);
}
@Override
+ @Transactional(rollbackFor = Exception.class)
public void cancelTaskByOrderId(Long workOrderId) {
+ equipmentService.lock();
// 1. 璇诲彇宸ュ崟涓嬫墍鏈変换鍔★紝杩囨护鎺夊凡瀹屾垚/宸插彇娑堢殑
List<MesProTaskDO> tasks = taskMapper.selectListByWorkOrderId(workOrderId);
LocalDateTime now = LocalDateTime.now();
@@ -451,6 +459,7 @@
if (CollUtil.isNotEmpty(updateList)) {
taskMapper.updateBatch(updateList);
}
+ equipmentService.afterTaskStateChanged(tasks);
}
@Override
@@ -582,10 +591,12 @@
@Override
@Transactional(rollbackFor = Exception.class)
public void pauseTask(MesProTaskPauseReqVO pauseReqVO) {
+ equipmentService.lock();
// 1. 鏍￠獙浠诲姟瀛樺湪
MesProTaskDO task = validateTaskExists(pauseReqVO.getId());
// 2. 鏍￠獙鐘舵�佹槸鍚﹀厑璁稿仠宸ワ紙濡傚繀椤绘槸 鐢熶骇涓� 鎴� 閮ㄥ垎瀹屾垚锛�
- if (!ObjectUtils.equalsAny(task.getStatus(), MesProTaskStatusEnum.PREPARE.getStatus())) {
+ if (!ObjectUtils.equalsAny(task.getStatus(), MesProTaskStatusEnum.PREPARE.getStatus(),
+ MesProTaskStatusEnum.PRODUCING.getStatus(), MesProTaskStatusEnum.PARTIAL_FINISHED.getStatus())) {
throw exception(PRO_TASK_CANNOT_PAUSE);
}
@@ -602,11 +613,13 @@
.setPauseTime(LocalDateTime.now())
.setPauseUserId(SecurityFrameworkUtils.getLoginUserId());
taskPauseRecordMapper.insert(pauseRecord);
+ equipmentService.afterTaskStateChanged(List.of(task));
}
@Override
@Transactional(rollbackFor = Exception.class)
public void resumeTask(MesProTaskResumeReqVO resumeReqVO) {
+ equipmentService.lock();
// 1. 鏍￠獙浠诲姟瀛樺湪
MesProTaskDO task = validateTaskExists(resumeReqVO.getId());
// 2. 鏍￠獙鐘舵�佸繀椤绘槸宸插仠宸�
@@ -615,8 +628,11 @@
}
// 3. 鎭㈠浠诲姟鐘舵��
- Integer resumeStatus = MesProTaskStatusEnum.PREPARE.getStatus();
+ Integer resumeStatus = task.getProducedQuantity() != null && task.getProducedQuantity().signum() > 0
+ ? MesProTaskStatusEnum.PARTIAL_FINISHED.getStatus() : MesProTaskStatusEnum.PREPARE.getStatus();
taskMapper.updateById(new MesProTaskDO().setId(task.getId()).setStatus(resumeStatus));
+ equipmentService.validateResume(task);
+ equipmentService.afterTaskStateChanged(List.of(task));
// 4. 鏇存柊鏈�鏂扮殑涓�鏉″仠宸ヨ褰�
MesProTaskPauseRecordDO pauseRecord = taskPauseRecordMapper.selectLastUnresumedByTaskId(task.getId());
--
Gitblit v1.9.3