From ac2e2b5af3726ee64dc37c3ebf26989a0346f22a Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期六, 07 十一月 2026 19:16:05 +0800
Subject: [PATCH] feat(feedback): 优化报工审批流程并增加报工人校验
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/feedback/MesProFeedbackServiceImpl.java | 381 +++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 305 insertions(+), 76 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 0692667..a7c3f92 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
@@ -1,15 +1,18 @@
package cn.iocoder.yudao.module.mes.service.pro.feedback;
import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ObjUtil;
import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+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;
import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
import cn.iocoder.yudao.module.mes.controller.admin.pro.feedback.vo.*;
import cn.iocoder.yudao.module.mes.enums.md.autocode.MesMdAutoCodeRuleCodeEnum;
import cn.iocoder.yudao.module.mes.enums.pro.MesProFeedbackTypeEnum;
+import cn.iocoder.yudao.module.mes.enums.qc.MesQcTypeEnum;
+import cn.iocoder.yudao.module.mes.service.qc.template.MesQcTemplateItemService;
import cn.iocoder.yudao.module.mes.enums.pro.MesProWorkOrderTypeEnum;
import cn.iocoder.yudao.module.mes.service.md.autocode.MesMdAutoCodeRecordService;
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.feedback.MesProFeedbackDO;
@@ -31,6 +34,7 @@
import cn.iocoder.yudao.module.mes.service.pro.workorder.MesProWorkOrderProcessService;
import cn.iocoder.yudao.module.mes.service.pro.workorder.MesProWorkOrderService;
import cn.iocoder.yudao.module.mes.service.wm.itemconsume.MesWmItemConsumeService;
+import cn.iocoder.yudao.module.mes.service.wm.productissue.MesWmProductIssueService;
import cn.iocoder.yudao.module.mes.service.wm.productproduce.MesWmProductProduceLineService;
import cn.iocoder.yudao.module.mes.service.wm.productproduce.MesWmProductProduceService;
import cn.iocoder.yudao.module.mes.service.mdm.MesMdmItemService;
@@ -58,9 +62,11 @@
import java.util.Map;
import java.util.Objects;
import java.util.Set;
+import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.Collectors;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.*;
/**
@@ -74,6 +80,8 @@
@Resource
private MesProFeedbackMapper feedbackMapper;
+ @Resource
+ private MesFeedbackParamService feedbackParamService;
@Resource
private MesProWorkOrderService workOrderService;
@@ -89,6 +97,8 @@
@Resource
private MesWmItemConsumeService itemConsumeService;
@Resource
+ private MesWmProductIssueService productIssueService;
+ @Resource
private MesWmProductProduceService productProduceService;
@Resource
private MesWmProductProduceLineService produceLineService;
@@ -102,39 +112,126 @@
private MesMdmItemService mdmItemService;
@Resource
private MdmItemBatchConfigApi itemBatchConfigApi;
+ @Resource
+ private MesQcTemplateItemService templateItemService;
@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);
}
- @Override
- public void deleteFeedback(Long id) {
- // 1. 鏍￠獙瀛樺湪 + 鑽夌鐘舵��
- validateFeedbackStatusPrepare(id);
+ 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, "浠诲姟淇℃伅宸插彉鏇达紝璇烽噸鏂伴�夋嫨浠诲姟");
+ }
- // 2. 鍒犻櫎
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public MesProFeedbackImportRespVO importFeedbackList(List<MesProFeedbackImportExcelVO> importList,
+ boolean updateSupport) {
+ // 1. 鏍￠獙闈炵┖
+ if (CollUtil.isEmpty(importList)) {
+ throw exception(MES_PRO_FEEDBACK_IMPORT_LIST_IS_EMPTY);
+ }
+
+ // 2. 閫愯澶勭悊
+ MesProFeedbackImportRespVO respVO = MesProFeedbackImportRespVO.builder()
+ .createCodes(new ArrayList<>()).updateCodes(new ArrayList<>())
+ .failureCodes(new LinkedHashMap<>()).build();
+ AtomicInteger index = new AtomicInteger(1);
+ importList.forEach(importItem -> {
+ int currentIndex = index.getAndIncrement();
+ String key = StrUtil.blankToDefault(importItem.getCode(), "绗� " + currentIndex + " 琛�");
+ if (StrUtil.isBlank(importItem.getCode())) {
+ respVO.getFailureCodes().put(key, "鎶ュ伐鍗曠紪鍙蜂笉鑳戒负绌�");
+ return;
+ }
+ if (StrUtil.isBlank(importItem.getTaskCode())) {
+ respVO.getFailureCodes().put(key, "鐢熶骇浠诲姟缂栫爜涓嶈兘涓虹┖");
+ return;
+ }
+ // 2.1 瑙ｆ瀽鐢熶骇浠诲姟
+ MesProTaskDO task = taskService.getTaskByCode(importItem.getTaskCode().trim());
+ if (task == null) {
+ respVO.getFailureCodes().put(key, "鐢熶骇浠诲姟缂栫爜[" + importItem.getTaskCode() + "]涓嶅瓨鍦�");
+ return;
+ }
+ // 2.2 鏋勫缓璇锋眰骞跺垱寤�/鏇存柊锛堝鐢� create/update 鏈嶅姟锛屾姤宸ヤ汉/瀹℃牳浜哄彇褰撳墠鐧诲綍鐢ㄦ埛锛�
+ MesProFeedbackSaveReqVO reqVO = BeanUtils.toBean(importItem, MesProFeedbackSaveReqVO.class);
+ reqVO.setTaskId(task.getId());
+ Long loginUserId = getLoginUserId();
+ reqVO.setFeedbackUserId(ObjUtil.defaultIfNull(reqVO.getFeedbackUserId(), loginUserId));
+ reqVO.setApproveUserId(ObjUtil.defaultIfNull(reqVO.getApproveUserId(), loginUserId));
+ MesProFeedbackDO existFeedback = feedbackMapper.selectByCode(importItem.getCode());
+ try {
+ if (existFeedback == null) {
+ reqVO.setId(null);
+ createFeedback(reqVO);
+ respVO.getCreateCodes().add(importItem.getCode());
+ } else if (updateSupport) {
+ reqVO.setId(existFeedback.getId());
+ updateFeedback(reqVO);
+ respVO.getUpdateCodes().add(importItem.getCode());
+ } else {
+ respVO.getFailureCodes().put(key, "鎶ュ伐鍗曠紪鍙峰凡瀛樺湪");
+ }
+ } catch (ServiceException e) {
+ respVO.getFailureCodes().put(key, e.getMessage());
+ }
+ });
+ return respVO;
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void deleteFeedback(Long id) {
+ 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);
}
@@ -162,19 +259,29 @@
}
@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());
+ validateTaskAssignee(task);
+ 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
+ @Transactional(rollbackFor = Exception.class)
public void rejectFeedback(Long id) {
// 1. 鏍￠獙瀛樺湪 + 瀹℃壒涓姸鎬�
- validateFeedbackStatusApproving(id);
+ MesProFeedbackDO feedback = lockFeedbackStatusApproving(id);
+ // 1.1 鏍￠獙褰撳墠鐧诲綍浜烘槸璇ユ姤宸ュ崟鐨勬寚瀹氬鏍镐汉
+ validateCurrentUserIsApprover(feedback);
// 2. 鏇存柊鐘舵�佷负鑽夌
feedbackMapper.updateById(new MesProFeedbackDO().setId(id)
@@ -185,7 +292,9 @@
@Transactional(rollbackFor = Exception.class)
public boolean approveFeedback(MesProFeedbackApproveReqVO reqVO) {
// 1.1 鏍￠獙瀛樺湪 + 瀹℃壒涓姸鎬�
- MesProFeedbackDO feedback = validateFeedbackStatusApproving(reqVO.getId());
+ MesProFeedbackDO feedback = lockFeedbackStatusApproving(reqVO.getId());
+ // 1.1.1 鏍￠獙褰撳墠鐧诲綍浜烘槸璇ユ姤宸ュ崟鐨勬寚瀹氬鏍镐汉
+ validateCurrentUserIsApprover(feedback);
// 1.2 鏍￠獙鎶ュ伐鏁伴噺 > 0
if (feedback.getFeedbackQuantity() == null
|| feedback.getFeedbackQuantity().compareTo(BigDecimal.ZERO) <= 0) {
@@ -194,11 +303,10 @@
// 1.3 鏍￠獙浠诲姟鏈畬鎴�
taskService.validateTaskNotFinished(feedback.getTaskId());
- // 2.1 鏌ヨ宸ュ簭鐨勫叧閿伐搴忔爣璇� + 妫�楠屾爣璇嗭紙闇�鍦� uncheckQuantity 鏍￠獙涔嬪墠锛屽洜涓鸿川妫�宸ュ簭鍏佽 uncheckQuantity > 0锛�
- MesProRouteProcessDO routeProcess = routeProcessService.getRouteProcessByRouteIdAndProcessId(
- feedback.getRouteId(), feedback.getProcessId());
- boolean keyFlag = routeProcess != null && Boolean.TRUE.equals(routeProcess.getKeyFlag());
- boolean checkFlag = routeProcess != null && Boolean.TRUE.equals(routeProcess.getCheckFlag());
+ // 2.1 鏌ヨ宸ュ簭鐨勬楠屾爣璇嗭紙宸ュ崟宸ュ簭蹇収浼樺厛锛岄渶鍦� uncheckQuantity 鏍￠獙涔嬪墠锛屽洜涓鸿川妫�宸ュ簭鍏佽 uncheckQuantity > 0锛�
+ ProcessFlags processFlags = resolveProcessFlags(feedback.getRouteId(), feedback.getWorkOrderId(),
+ feedback.getProcessId());
+ boolean checkFlag = processFlags.checkFlag();
// 2.2 闈炶川妫�宸ュ簭锛氫粛鏈夊緟妫�鏁伴噺鏃朵笉鑳藉鎵癸紙璐ㄦ宸ュ簭鐨� uncheckQuantity > 0 鏄甯哥姸鎬侊紝涓嶅仛鎷︽埅锛�
if (!checkFlag
&& feedback.getUncheckQuantity() != null
@@ -206,12 +314,29 @@
throw exception(PRO_FEEDBACK_UNCHECK_QUANTITY_EXISTS, feedback.getUncheckQuantity());
}
+ if (checkFlag) {
+ try {
+ templateItemService.getRequiredTemplateByItemIdAndType(feedback.getItemId(), MesQcTypeEnum.IPQC.getType());
+ } catch (ServiceException e) {
+ if (!Objects.equals(e.getCode(), QC_NO_TEMPLATE.getCode())) throw e;
+ MesMdmItemDO item = mdmItemService.getItem(feedback.getItemId());
+ String name = item != null ? item.getName() + "锛�" + item.getCode() + "锛�" : "ID " + feedback.getItemId();
+ throw exception(PRO_FEEDBACK_PARAM_INVALID, "鐗╂枡銆�" + name + "銆戞湭閰嶇疆鍚敤鐨勮繃绋嬫楠屾ā鏉匡紝璇峰厛閰嶇疆鍚庡啀瀹℃壒");
+ }
+ } else {
+ BigDecimal qualified = ObjectUtil.defaultIfNull(feedback.getQualifiedQuantity(), BigDecimal.ZERO);
+ BigDecimal unqualified = ObjectUtil.defaultIfNull(feedback.getUnqualifiedQuantity(), BigDecimal.ZERO);
+ if (qualified.signum() < 0 || unqualified.signum() < 0
+ || qualified.add(unqualified).compareTo(feedback.getFeedbackQuantity()) != 0) {
+ throw exception(PRO_FEEDBACK_PARAM_INVALID, "鍚堟牸鏁板拰涓嶅悎鏍兼暟蹇呴』闈炶礋涓斿悎璁＄瓑浜庢姤宸ユ暟閲�");
+ }
+ }
// 3. 鐗╂枡娑堣�楋細鍊掑啿宸ュ簭鎸� BOM 鑷姩鎵ｆ枡锛涢潪鍊掑啿宸ュ簭璺宠繃锛堢墿鏂欒蛋鎵嬪伐棰嗘枡/鎶曟枡锛�
- boolean backflushFlag = routeProcess != null && Boolean.TRUE.equals(routeProcess.getBackflushFlag());
+ boolean backflushFlag = processFlags.backflushFlag();
if (backflushFlag) {
- // 3.1 鏍￠獙鍊掑啿宸ュ簭蹇呴』閰嶇疆 BOM 娑堣�楋紝閬垮厤闈欓粯涓嶆墸鏂�
- List<MesProWorkOrderBomDO> boms = workOrderBomService.getWorkOrderBomListByWorkOrderId(
- feedback.getWorkOrderId());
+ // 3.1 鏍￠獙褰撳墠鍊掑啿宸ュ簭蹇呴』閰嶇疆鎶曟枡 BOM锛岄伩鍏嶉潤榛樹笉鎵ｆ枡
+ List<MesProWorkOrderBomDO> boms = workOrderBomService.getWorkOrderBomListByWorkOrderIdAndProcessId(
+ feedback.getWorkOrderId(), feedback.getProcessId());
if (CollUtil.isEmpty(boms)) {
throw exception(PRO_FEEDBACK_BACKFLUSH_BOM_REQUIRED);
}
@@ -219,27 +344,12 @@
MesWmItemConsumeDO itemConsume = itemConsumeService.generateItemConsume(feedback);
if (itemConsume != null) {
itemConsumeService.finishItemConsume(itemConsume.getId());
+ // 娑堣�楀崟璐熻矗瀹為檯鎵ｅ簱锛涢鏂欏崟浠呬綔涓哄�掑啿涓氬姟鍑瘉锛岄伩鍏嶉噸澶嶆墸鍑忓簱瀛�
+ productIssueService.generateBackflushProductIssue(feedback, itemConsume);
}
}
- // 5. 鍏堟洿鏂版姤宸ョ姸鎬佷负宸插畬鎴愶紙纭繚 checkAndFinishMps 妫�鏌ユ椂褰撳墠鎶ュ伐宸叉爣璁板畬鎴愶級
- feedbackMapper.updateById(new MesProFeedbackDO().setId(reqVO.getId())
- .setStatus(MesProFeedbackStatusEnum.FINISHED.getStatus())
- .setUncheckQuantity(BigDecimal.ZERO));
-
- // 6. 鏍规嵁鏄惁闇�瑕佹楠岋紝鍐冲畾浜у嚭鍜屽叆搴撴柟寮�
- // 6.2 璋冩暣 鍙瀹℃壒鎴愬姛鐩存帴鏇存柊
- // 鍏抽敭宸ュ簭锛氭洿鏂颁换鍔� + 宸ュ崟鐨勫凡鐢熶骇鏁伴噺锛涢潪鍏抽敭宸ュ簭锛氬彧鏇存柊浠诲姟鐨勫凡鐢熶骇鏁伴噺锛堝伐鍗曞彧鐪嬪叧閿伐搴忎骇鍑猴級
- if (keyFlag) {
- updateTaskAndWorkOrderByFeedback(feedback);
- } else {
- taskService.updateProducedQuantity(feedback.getTaskId(),
- feedback.getFeedbackQuantity(),
- ObjectUtil.defaultIfNull(feedback.getQualifiedQuantity(), BigDecimal.ZERO),
- ObjectUtil.defaultIfNull(feedback.getUnqualifiedQuantity(), BigDecimal.ZERO));
- checkAndPublishProductionFinished(feedback.getWorkOrderId());
-
- }
+ // 4. 鍏堢敓鎴愪骇鍑猴紱杩涘害浠呭湪浜у嚭瀹屾垚涓旀姤宸ョ姸鎬佸彉涓哄畬鎴愬悗鏇存柊銆�
if (checkFlag) {
// 6.1 闇�瑕佹楠岋細鐢熸垚浜у嚭鍗曪紙璐ㄩ噺鐘舵��=寰呮楠岋級锛屾洿鏂版姤宸ョ姸鎬佷负寰呮楠岋紝绛夎川妫�瀹屾垚鍥炶皟鍚庡啀鍏ュ簱
// 瀹屾垚鏃跺洖璋冭锛歁esQcIpqcServiceImpl#finishIpqc 鈫� splitPendingAndFinishProduce + updateProFeedbackWhenIpqcFinish
@@ -251,6 +361,9 @@
// 6.2 鏃犻渶妫�楠岋細鐢熸垚浜у嚭鍗曪紙鎸夊悎鏍�/涓嶅悎鏍兼媶琛岋級锛岀洿鎺ュ畬鎴愬叆搴�
MesWmProductProduceDO produce = productProduceService.generateProductProduce(feedback, false, reqVO);
productProduceService.finishProductProduce(produce.getId());
+ feedbackMapper.updateById(new MesProFeedbackDO().setId(reqVO.getId())
+ .setStatus(MesProFeedbackStatusEnum.FINISHED.getStatus()).setUncheckQuantity(BigDecimal.ZERO));
+ updateTaskAndWorkOrderByFeedback(feedback);
}
@@ -270,11 +383,15 @@
* @param feedback 鎶ュ伐鍗�
*/
private void updateTaskAndWorkOrderByFeedback(MesProFeedbackDO feedback) {
- // 1. 鏌ヨ璇ユ姤宸ュ崟鍏宠仈鐨勬墍鏈変骇鍑哄崟琛岋紝鎸夎川閲忕姸鎬佽仛鍚堟暟閲�
+ // 1. 鏌ヨ璇ユ姤宸ュ崟鍏宠仈鐨勪骇鍑哄崟琛岋紝鍙寜涓讳骇鍑虹墿鏂欙紙鎶ュ伐鐗╂枡锛夎仛鍚堝悎鏍�/涓嶅悎鏍兼暟閲忥紝
+ // 鑱斾骇鍑虹墿鏂欏崟鐙楠岋紝涓嶈鍏ヤ换鍔¤繘搴�
BigDecimal qualifiedQty = BigDecimal.ZERO;
BigDecimal unqualifiedQty = BigDecimal.ZERO;
List<MesWmProductProduceLineDO> lines = produceLineService.getProductProduceLineListByFeedbackId(feedback.getId());
for (MesWmProductProduceLineDO line : lines) {
+ if (!ObjUtil.equal(line.getItemId(), feedback.getItemId())) {
+ continue;
+ }
if (ObjUtil.equal(line.getQualityStatus(), MesWmQualityStatusEnum.FAIL.getStatus())) {
unqualifiedQty = unqualifiedQty.add(line.getQuantity());
}
@@ -289,7 +406,24 @@
// 3. 鏇存柊璁㈠崟鐨勫凡鐢熶骇鏁伴噺
// 鏂板閫昏緫锛氬彧鏈夊湪璇ョ瑪璁㈠崟鏈�鍚庝竴涓伐搴忔墠鏇存柊鐢熶骇璁㈠崟鐨勫凡鐢熶骇鏁伴噺
MesProWorkOrderProcessDO lastProcess = workOrderProcessService.getLastWorkOrderProcessByWorkOrderId(feedback.getWorkOrderId());
- if (lastProcess != null && ObjUtil.equal(lastProcess.getProcessId(), feedback.getProcessId())) {
+ Long lastProcessId;
+ if (lastProcess != null) {
+ lastProcessId = lastProcess.getProcessId();
+ } else {
+ // 鏃у伐鍗曞彲鑳芥病鏈変繚瀛樺伐鍗曞伐搴忥細涓庢帓浜т竴鑷村洖閫�鍒板伐鑹鸿矾绾垮伐搴忋��
+ List<MesProRouteProcessDO> routeProcesses = routeProcessService.getRouteProcessListByRouteId(feedback.getRouteId());
+ if (CollUtil.isEmpty(routeProcesses) || routeProcesses.stream().anyMatch(process -> process.getSort() == null)) {
+ throw exception(PRO_FEEDBACK_PARAM_INVALID, "鏃犳硶纭畾鏈亾宸ュ簭锛岃妫�鏌ュ伐鍗曞拰宸ヨ壓璺嚎鐨勫伐搴忛『搴�");
+ }
+ int maxSort = routeProcesses.stream().mapToInt(MesProRouteProcessDO::getSort).max().orElseThrow();
+ List<MesProRouteProcessDO> lastProcesses = routeProcesses.stream()
+ .filter(process -> process.getSort() == maxSort).toList();
+ if (lastProcesses.size() != 1 || lastProcesses.get(0).getProcessId() == null) {
+ throw exception(PRO_FEEDBACK_PARAM_INVALID, "鏃犳硶鍞竴纭畾鏈亾宸ュ簭锛岃妫�鏌ュ伐鑹鸿矾绾跨殑宸ュ簭椤哄簭");
+ }
+ lastProcessId = lastProcesses.get(0).getProcessId();
+ }
+ if (ObjUtil.equal(lastProcessId, feedback.getProcessId())) {
workOrderService.updateProducedQuantity(feedback.getWorkOrderId(),
feedback.getFeedbackQuantity());
// 4. 鏇存柊 MPS 鐨勫凡鐢熶骇鏁伴噺锛堝鏋滄槸閿�鍞鍗曟潵婧愶級
@@ -342,12 +476,53 @@
return feedback;
}
+ private MesProFeedbackDO lockFeedbackStatusApproving(Long id) {
+ MesProFeedbackDO feedback = feedbackMapper.selectOne(new LambdaQueryWrapperX<MesProFeedbackDO>()
+ .eq(MesProFeedbackDO::getId, id).last("FOR UPDATE"));
+ if (feedback == null) throw exception(PRO_FEEDBACK_NOT_EXISTS);
+ if (ObjUtil.notEqual(feedback.getStatus(), MesProFeedbackStatusEnum.APPROVING.getStatus()))
+ throw exception(PRO_FEEDBACK_NOT_APPROVING);
+ return feedback;
+ }
private MesProFeedbackDO validateFeedbackStatusApproving(Long id) {
MesProFeedbackDO feedback = validateFeedbackExists(id);
if (ObjUtil.notEqual(feedback.getStatus(), MesProFeedbackStatusEnum.APPROVING.getStatus())) {
throw exception(PRO_FEEDBACK_NOT_APPROVING);
}
return feedback;
+ }
+
+ /**
+ * 鏍￠獙褰撳墠鐧诲綍鐢ㄦ埛鏄惁涓烘姤宸ュ崟鎸囧畾鐨勫鏍镐汉
+ *
+ * 鎶ュ伐鍗曞垱寤烘椂蹇呴』鎸囧畾 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);
+ }
+ }
+
+ /**
+ * 鏍￠獙褰撳墠鐧诲綍浜烘槸鍚︿负浠诲姟鐨勬姤宸ヤ汉锛涗换鍔℃湭閰嶇疆鎶ュ伐浜烘椂鏃犱汉鍙姤宸�
+ */
+ private void validateTaskAssignee(MesProTaskDO task) {
+ Long loginUserId = getLoginUserId();
+ if (loginUserId == null) {
+ throw exception(PRO_FEEDBACK_NOT_ASSIGNED);
+ }
+ String current = String.valueOf(loginUserId);
+ boolean assigned = StrUtil.split(task.getAssigneeUserIds(), ',')
+ .stream().map(String::trim).anyMatch(current::equals);
+ if (!assigned) {
+ throw exception(PRO_FEEDBACK_NOT_ASSIGNED);
+ }
}
/**
@@ -367,6 +542,8 @@
if (!MesProTaskStatusEnum.canFeedback(task.getStatus())) {
throw exception(PRO_FEEDBACK_CANNOT_CREATE_WHEN_PAUSED);
}
+ // 鏍￠獙褰撳墠鐧诲綍浜烘槸璇ヤ换鍔＄殑鎶ュ伐浜�
+ validateTaskAssignee(task);
// 2. 浠庝换鍔¤嚜鍔ㄥ～鍏呭叧鑱斿瓧娈碉紙鍓嶇鏃犻渶浼犲叆锛屽悗绔粺涓�浠庝换鍔¤幏鍙栵級
reqVO.setWorkOrderId(task.getWorkOrderId());
@@ -375,14 +552,9 @@
reqVO.setItemId(task.getItemId());
reqVO.setWorkstationId(task.getWorkstationId());
- // 3. 鏍￠獙宸ヨ壓璺嚎 + 宸ュ簭閰嶇疆鏈夋晥
- MesProRouteProcessDO routeProcess = routeProcessService.getRouteProcessByRouteIdAndProcessId(
- task.getRouteId(), task.getProcessId());
- if (routeProcess == null) {
- throw exception(PRO_FEEDBACK_ROUTE_PROCESS_INVALID);
- }
+ // 3. 鏍￠獙宸ュ崟宸ュ簭 / 宸ヨ壓璺嚎宸ュ簭閰嶇疆鏈夋晥
+ boolean checkFlag = resolveProcessFlags(task.getRouteId(), task.getWorkOrderId(), task.getProcessId()).checkFlag();
// 4.1 鏍￠獙鏁伴噺
- boolean checkFlag = Boolean.TRUE.equals(routeProcess.getCheckFlag());
if (checkFlag) {
// 闇�瑕佹楠岋細鍙渶濉姤宸ユ暟閲忥紝涓斿繀椤� > 0
if (reqVO.getFeedbackQuantity() == null
@@ -401,6 +573,30 @@
return task;
}
+ /**
+ * 瑙ｆ瀽宸ュ簭鐨勬楠屾爣璇嗕笌鍊掑啿鏍囪瘑
+ *
+ * <p>宸ュ崟宸ュ簭蹇収锛坢es_pro_work_order_process锛夋槸涓嬪崟鏃剁‘璁ょ殑鏉冨▉閰嶇疆锛屼紭鍏堜娇鐢紱
+ * 宸ュ崟鏈淮鎶よ宸ュ簭鏃跺啀鍥為��鍒板伐鑹鸿矾绾挎ā鏉匡紙mes_pro_route_process锛夈��
+ */
+ private ProcessFlags resolveProcessFlags(Long routeId, Long workOrderId, Long processId) {
+ MesProWorkOrderProcessDO workOrderProcess = workOrderId != null && processId != null
+ ? workOrderProcessService.getWorkOrderProcessByWorkOrderIdAndProcessId(workOrderId, processId) : null;
+ MesProRouteProcessDO routeProcess = routeId != null && processId != null
+ ? routeProcessService.getRouteProcessByRouteIdAndProcessId(routeId, processId) : null;
+ if (workOrderProcess == null && routeProcess == null) {
+ throw exception(PRO_FEEDBACK_ROUTE_PROCESS_INVALID);
+ }
+ Boolean checkFlag = workOrderProcess != null && workOrderProcess.getCheckFlag() != null
+ ? workOrderProcess.getCheckFlag() : routeProcess != null ? routeProcess.getCheckFlag() : null;
+ Boolean backflushFlag = workOrderProcess != null && workOrderProcess.getBackflushFlag() != null
+ ? workOrderProcess.getBackflushFlag() : routeProcess != null ? routeProcess.getBackflushFlag() : null;
+ return new ProcessFlags(Boolean.TRUE.equals(checkFlag), Boolean.TRUE.equals(backflushFlag));
+ }
+
+ private record ProcessFlags(boolean checkFlag, boolean backflushFlag) {
+ }
+
@Override
@Transactional(rollbackFor = Exception.class)
public MesProFeedbackQuickCreateRespVO quickCreateFeedback(MesProFeedbackQuickCreateReqVO reqVO) {
@@ -411,15 +607,12 @@
if (!MesProTaskStatusEnum.canFeedback(task.getStatus())) {
throw exception(PRO_FEEDBACK_CANNOT_CREATE_WHEN_PAUSED);
}
+ // 鏍￠獙褰撳墠鐧诲綍浜烘槸璇ヤ换鍔＄殑鎶ュ伐浜�
+ validateTaskAssignee(task);
- // 2. 鏍￠獙宸ヨ壓璺嚎宸ュ簭閰嶇疆
- MesProRouteProcessDO routeProcess = routeProcessService.getRouteProcessByRouteIdAndProcessId(
- task.getRouteId(), task.getProcessId());
- if (routeProcess == null) {
- throw exception(PRO_FEEDBACK_ROUTE_PROCESS_INVALID);
- }
+ // 2. 鏍￠獙宸ュ崟宸ュ簭 / 宸ヨ壓璺嚎宸ュ簭閰嶇疆
+ boolean checkFlag = resolveProcessFlags(task.getRouteId(), task.getWorkOrderId(), task.getProcessId()).checkFlag();
// 3. 鏍￠獙鏁伴噺
- boolean checkFlag = Boolean.TRUE.equals(routeProcess.getCheckFlag());
if (checkFlag) {
if (reqVO.getFeedbackQuantity() == null
|| reqVO.getFeedbackQuantity().compareTo(BigDecimal.ZERO) <= 0) {
@@ -449,6 +642,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());
@@ -466,6 +667,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());
@@ -498,28 +704,51 @@
BigDecimal qualifiedQty, BigDecimal unqualifiedQty,
BigDecimal laborScrapQty, BigDecimal materialScrapQty, BigDecimal otherScrapQty) {
// 1. 鏍￠獙鎶ュ伐鍗曞瓨鍦ㄤ笖涓哄緟妫�楠岀姸鎬�
- MesProFeedbackDO feedback = validateFeedbackExists(feedbackId);
+ MesProFeedbackDO feedback = feedbackMapper.selectOne(new LambdaQueryWrapperX<MesProFeedbackDO>()
+ .eq(MesProFeedbackDO::getId, feedbackId).last("FOR UPDATE"));
+ if (feedback == null) throw exception(PRO_FEEDBACK_NOT_EXISTS);
if (ObjUtil.notEqual(feedback.getStatus(), MesProFeedbackStatusEnum.UNCHECK.getStatus())) {
throw exception(PRO_FEEDBACK_NOT_UNCHECK);
}
- // 2. 鎷嗗垎寰呮浜у嚭琛岋紙鍚堟牸/涓嶅悎鏍硷級锛岀敓鎴愭槑缁嗭紝瀹屾垚浜у嚭鍏ュ簱
+ // 2. 鎷嗗垎褰撳墠妫�楠岀殑浜у嚭琛岋紙鍚堟牸/涓嶅悎鏍硷級锛岀敓鎴愭槑缁嗭紱鍏ㄩ儴鐗╂枡妫�楠屽畬鎴愭墠瀹屾垚浜у嚭鍏ュ簱
productProduceService.splitPendingAndFinishProduce(feedbackId, sourceLineId, qualifiedQty, unqualifiedQty);
- // 3. 鍥炲啓鍚堟牸/涓嶅悎鏍�/搴熷搧鏁伴噺锛屾洿鏂扮姸鎬佷负宸插畬鎴�
- feedbackMapper.updateById(new MesProFeedbackDO().setId(feedbackId)
- .setQualifiedQuantity(qualifiedQty)
- .setUnqualifiedQuantity(unqualifiedQty)
- .setUncheckQuantity(BigDecimal.ZERO)
- .setLaborScrapQuantity(laborScrapQty)
- .setMaterialScrapQuantity(materialScrapQty)
- .setOtherScrapQuantity(otherScrapQty)
- .setStatus(MesProFeedbackStatusEnum.FINISHED.getStatus()));
+ // 3. 绱姞鏈妫�楠岀粨鏋滐紱鎶ュ伐鍗曞彧璁板綍涓讳骇鍑虹墿鏂欑殑鍚堟牸/涓嶅悎鏍�/搴熷搧鏁伴噺锛�
+ // 鑱斾骇鍑虹墿鏂欏悇鑷楠岋紝涓嶅苟鍏ユ姤宸ユ暟閲忥紱寰呭叏閮ㄤ骇鍑虹墿鏂欐楠屽畬鎴愭墠瀹屾垚鎶ュ伐
+ List<MesWmProductProduceLineDO> produceLines = produceLineService.getProductProduceLineListByFeedbackId(feedbackId);
+ MesWmProductProduceLineDO sourceLine = produceLines.stream()
+ .filter(line -> ObjUtil.equal(line.getId(), sourceLineId)).findFirst().orElse(null);
+ boolean mainOutput = sourceLine == null || ObjUtil.equal(sourceLine.getItemId(), feedback.getItemId());
+ BigDecimal totalQualified = ObjectUtil.defaultIfNull(feedback.getQualifiedQuantity(), BigDecimal.ZERO)
+ .add(mainOutput ? qualifiedQty : BigDecimal.ZERO);
+ BigDecimal totalUnqualified = ObjectUtil.defaultIfNull(feedback.getUnqualifiedQuantity(), BigDecimal.ZERO)
+ .add(mainOutput ? unqualifiedQty : BigDecimal.ZERO);
+ BigDecimal totalLaborScrap = ObjectUtil.defaultIfNull(feedback.getLaborScrapQuantity(), BigDecimal.ZERO)
+ .add(mainOutput ? laborScrapQty : BigDecimal.ZERO);
+ BigDecimal totalMaterialScrap = ObjectUtil.defaultIfNull(feedback.getMaterialScrapQuantity(), BigDecimal.ZERO)
+ .add(mainOutput ? materialScrapQty : BigDecimal.ZERO);
+ BigDecimal totalOtherScrap = ObjectUtil.defaultIfNull(feedback.getOtherScrapQuantity(), BigDecimal.ZERO)
+ .add(mainOutput ? otherScrapQty : BigDecimal.ZERO);
+ boolean allInspected = produceLines.stream()
+ .noneMatch(line -> ObjUtil.equal(line.getQualityStatus(), MesWmQualityStatusEnum.PENDING.getStatus()));
+ MesProFeedbackDO updateObj = new MesProFeedbackDO().setId(feedbackId)
+ .setQualifiedQuantity(totalQualified)
+ .setUnqualifiedQuantity(totalUnqualified)
+ .setLaborScrapQuantity(totalLaborScrap)
+ .setMaterialScrapQuantity(totalMaterialScrap)
+ .setOtherScrapQuantity(totalOtherScrap)
+ .setStatus(allInspected ? MesProFeedbackStatusEnum.FINISHED.getStatus()
+ : MesProFeedbackStatusEnum.UNCHECK.getStatus());
+ if (allInspected) {
+ updateObj.setUncheckQuantity(BigDecimal.ZERO);
+ }
+ feedbackMapper.updateById(updateObj);
- // 4. 鏇存柊浠诲姟/宸ュ崟鐨勫凡鐢熶骇鏁伴噺
- feedback.setQualifiedQuantity(qualifiedQty).setUnqualifiedQuantity(unqualifiedQty);
- //5.妫�鏌ュ苟鍙戝竷鐢熶骇瀹屾垚浜嬩欢
- checkAndPublishProductionFinished(feedback.getWorkOrderId());
+ // 4. 鍏ㄩ儴妫�楠屽畬鎴愬悗鍥炲啓浠诲姟/宸ュ崟杩涘害
+ if (allInspected) {
+ updateTaskAndWorkOrderByFeedback(feedback);
+ }
}
@Override
--
Gitblit v1.9.3