From 9075785a9e14f6220783d052d231f915c6930b87 Mon Sep 17 00:00:00 2001
From: xiaoyi <908147524@qq.com>
Date: 星期三, 04 十一月 2026 10:21:45 +0800
Subject: [PATCH] revert(collect): 撤销 collect 数采模块（新高设备管理已有自己的采集方式）
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/feedback/MesProFeedbackServiceImpl.java | 77 +++++++++++++++++++++++++++++++-------
1 files changed, 63 insertions(+), 14 deletions(-)
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 468a8c2..8edbfbf 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
@@ -78,6 +78,8 @@
@Resource
private MesProFeedbackMapper feedbackMapper;
+ @Resource
+ private MesFeedbackParamService feedbackParamService;
@Resource
private MesProWorkOrderService workOrderService;
@@ -110,29 +112,55 @@
private MdmItemBatchConfigApi itemBatchConfigApi;
@Override
+ @Transactional(rollbackFor = Exception.class)
public Long createFeedback(MesProFeedbackSaveReqVO createReqVO) {
// 1. 鏍￠獙
MesProTaskDO task = validateFeedbackData(createReqVO);
+ task = feedbackParamService.lockTask(task.getId());
+ validateLockedTaskDimensions(createReqVO, task);
- // 2. 鎻掑叆锛堣嚜鍔ㄥ～鍏� itemId锛�
+ // 2. 鎻掑叆锛堜富閿敱鏁版嵁搴撹嚜澧烇紝蹇界暐璇锋眰涓彲鑳芥畫鐣欑殑 id锛涜嚜鍔ㄥ～鍏� itemId锛�
MesProFeedbackDO feedback = BeanUtils.toBean(createReqVO, MesProFeedbackDO.class)
+ .setId(null)
.setStatus(MesProFeedbackStatusEnum.PREPARE.getStatus())
- .setItemId(task.getItemId());
+ .setItemId(task.getItemId())
+ .setParamSnapshot(feedbackParamService.buildDraft(task, createReqVO.getParamValues()));
feedbackMapper.insert(feedback);
return feedback.getId();
}
@Override
+ @Transactional(rollbackFor = Exception.class)
public void updateFeedback(MesProFeedbackSaveReqVO updateReqVO) {
- // 1.1 鏍￠獙瀛樺湪 + 鑽夌鐘舵��
- validateFeedbackStatusPrepare(updateReqVO.getId());
+ // 鍏堥攣鎶ュ伐鍐嶉攣浠诲姟锛屼笌鎻愪氦椤哄簭涓�鑷淬��
+ MesProFeedbackDO original = feedbackMapper.selectOne(new LambdaQueryWrapperX<MesProFeedbackDO>()
+ .eq(MesProFeedbackDO::getId, updateReqVO.getId()).last("FOR UPDATE"));
+ if (original == null) throw exception(PRO_FEEDBACK_NOT_EXISTS);
+ if (!Objects.equals(original.getStatus(), MesProFeedbackStatusEnum.PREPARE.getStatus()))
+ throw exception(PRO_FEEDBACK_NOT_PREPARE);
// 1.2 鏍￠獙涓氬姟鏁版嵁
MesProTaskDO task = validateFeedbackData(updateReqVO);
+ task = feedbackParamService.lockTask(task.getId());
+ validateLockedTaskDimensions(updateReqVO, task);
// 2. 鏇存柊锛堣嚜鍔ㄥ～鍏� itemId锛�
MesProFeedbackDO updateObj = BeanUtils.toBean(updateReqVO, MesProFeedbackDO.class)
.setItemId(task.getItemId());
+ if (updateReqVO.getParamValues() != null) {
+ String snapshot = feedbackParamService.buildDraft(task, updateReqVO.getParamValues());
+ updateObj.setParamSnapshot(snapshot == null ? "" : snapshot);
+ } else if (!Objects.equals(original.getTaskId(), task.getId())) {
+ updateObj.setParamSnapshot("");
+ }
feedbackMapper.updateById(updateObj);
+ }
+
+ private void validateLockedTaskDimensions(MesProFeedbackSaveReqVO req, MesProTaskDO task) {
+ if (!MesProTaskStatusEnum.canFeedback(task.getStatus())) throw exception(PRO_FEEDBACK_CANNOT_CREATE_WHEN_PAUSED);
+ if (!Objects.equals(req.getProcessId(), task.getProcessId())
+ || !Objects.equals(req.getWorkOrderId(), task.getWorkOrderId())
+ || !Objects.equals(req.getRouteId(), task.getRouteId()))
+ throw exception(PRO_FEEDBACK_PARAM_INVALID, "浠诲姟淇℃伅宸插彉鏇达紝璇烽噸鏂伴�夋嫨浠诲姟");
}
@Override
@@ -193,11 +221,13 @@
}
@Override
+ @Transactional(rollbackFor = Exception.class)
public void deleteFeedback(Long id) {
- // 1. 鏍￠獙瀛樺湪 + 鑽夌鐘舵��
- validateFeedbackStatusPrepare(id);
-
- // 2. 鍒犻櫎
+ MesProFeedbackDO feedback = feedbackMapper.selectOne(new LambdaQueryWrapperX<MesProFeedbackDO>()
+ .eq(MesProFeedbackDO::getId, id).last("FOR UPDATE"));
+ if (feedback == null) throw exception(PRO_FEEDBACK_NOT_EXISTS);
+ if (!Objects.equals(feedback.getStatus(), MesProFeedbackStatusEnum.PREPARE.getStatus()))
+ throw exception(PRO_FEEDBACK_NOT_PREPARE);
feedbackMapper.deleteById(id);
}
@@ -225,13 +255,19 @@
}
@Override
+ @Transactional(rollbackFor = Exception.class)
public void submitFeedback(Long id) {
- // 1. 鏍￠獙瀛樺湪 + 鑽夌鐘舵��
- validateFeedbackStatusPrepare(id);
-
- // 2. 鏇存柊鐘舵�佷负瀹℃壒涓紙鎶ュ伐浜哄拰鎶ュ伐鏃堕棿鐢辫〃鍗曚繚瀛樻椂纭畾锛屾彁浜や笉瑕嗙洊锛�
- feedbackMapper.updateById(new MesProFeedbackDO().setId(id)
- .setStatus(MesProFeedbackStatusEnum.APPROVING.getStatus()));
+ MesProFeedbackDO feedback = feedbackMapper.selectOne(new LambdaQueryWrapperX<MesProFeedbackDO>()
+ .eq(MesProFeedbackDO::getId, id).last("FOR UPDATE"));
+ if (feedback == null) throw exception(PRO_FEEDBACK_NOT_EXISTS);
+ if (!Objects.equals(feedback.getStatus(), MesProFeedbackStatusEnum.PREPARE.getStatus()))
+ throw exception(PRO_FEEDBACK_NOT_PREPARE);
+ MesProTaskDO task = feedbackParamService.lockTask(feedback.getTaskId());
+ String snapshot = feedbackParamService.complete(task, feedback.getParamSnapshot());
+ MesProFeedbackDO update = new MesProFeedbackDO().setId(id)
+ .setStatus(MesProFeedbackStatusEnum.APPROVING.getStatus());
+ if (snapshot != null) update.setParamSnapshot(snapshot);
+ feedbackMapper.updateById(update);
}
@Override
@@ -535,6 +571,14 @@
.setFeedbackTime(LocalDateTime.now())
.setStatus(MesProFeedbackStatusEnum.APPROVING.getStatus())
.setRemark(reqVO.getRemark());
+ MesProTaskDO lockedTask = feedbackParamService.lockTask(task.getId());
+ if (!MesProTaskStatusEnum.canFeedback(lockedTask.getStatus())) throw exception(PRO_FEEDBACK_CANNOT_CREATE_WHEN_PAUSED);
+ if (!Objects.equals(task.getProcessId(), lockedTask.getProcessId())
+ || !Objects.equals(task.getWorkOrderId(), lockedTask.getWorkOrderId())
+ || !Objects.equals(task.getRouteId(), lockedTask.getRouteId()))
+ throw exception(PRO_FEEDBACK_PARAM_INVALID, "浠诲姟淇℃伅宸插彉鏇达紝璇烽噸鏂版姤宸�");
+ String draftParam = feedbackParamService.buildDraft(lockedTask, reqVO.getParamValues());
+ feedback.setParamSnapshot(feedbackParamService.complete(lockedTask, draftParam));
feedbackMapper.insert(feedback);
// 5. 杩斿洖缁撴灉
MesProWorkOrderDO workOrder = workOrderService.getWorkOrder(task.getWorkOrderId());
@@ -552,6 +596,11 @@
int failCount = 0;
for (Long taskId : reqVO.getTaskIds()) {
try {
+ MesProTaskDO batchTask = feedbackParamService.lockTask(taskId);
+ if (Objects.equals(batchTask.getParamCollectMode(), 1)
+ || (Objects.equals(batchTask.getParamCollectMode(), 2) && StrUtil.isBlank(batchTask.getParamSharedSnapshot()))) {
+ throw exception(PRO_FEEDBACK_PARAM_INVALID, "璇ヤ换鍔￠渶瑕佸崟鐙～鍐欏弬鏁帮紝璇蜂娇鐢ㄥ崟绗旀姤宸�");
+ }
MesProFeedbackQuickCreateReqVO singleReq = new MesProFeedbackQuickCreateReqVO();
singleReq.setTaskId(taskId);
singleReq.setFeedbackQuantity(reqVO.getFeedbackQuantity());
--
Gitblit v1.9.3