From 5072520172e8f45e3ccb8afc26cf0c8186ba4cdd Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期一, 19 十月 2026 16:31:42 +0800
Subject: [PATCH] refactor(mes): 重构质量管理和批次绑定功能
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/oqc/MesQcOqcServiceImpl.java | 113 +++-----------------------------------------------------
1 files changed, 6 insertions(+), 107 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/oqc/MesQcOqcServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/oqc/MesQcOqcServiceImpl.java
index 26811bf..57b4dd2 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/oqc/MesQcOqcServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/oqc/MesQcOqcServiceImpl.java
@@ -1,18 +1,14 @@
package cn.iocoder.yudao.module.mes.service.qc.oqc;
import cn.hutool.core.util.ObjUtil;
-import cn.hutool.json.JSONUtil;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.module.mes.controller.admin.qc.oqc.vo.MesQcOqcPageReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.qc.oqc.vo.MesQcOqcSaveReqVO;
-import cn.iocoder.yudao.module.mes.controller.admin.qc.oqc.vo.MesQcOqcRetestReqVO;
import cn.iocoder.yudao.module.mes.dal.dataobject.qc.defectrecord.MesQcDefectRecordDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.qc.oqc.MesQcOqcDO;
-import cn.iocoder.yudao.module.mes.dal.dataobject.qc.oqc.MesQcOqcActionDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.qc.template.MesQcTemplateItemDO;
import cn.iocoder.yudao.module.mes.dal.mysql.qc.oqc.MesQcOqcMapper;
-import cn.iocoder.yudao.module.mes.dal.mysql.qc.oqc.MesQcOqcActionMapper;
import cn.iocoder.yudao.module.mes.enums.qc.MesQcDefectLevelEnum;
import cn.iocoder.yudao.module.mes.enums.qc.MesQcStatusEnum;
import cn.iocoder.yudao.module.mes.enums.qc.MesQcTypeEnum;
@@ -40,11 +36,8 @@
import java.math.RoundingMode;
import java.util.List;
import java.util.Objects;
-import java.time.LocalDateTime;
-import java.util.Set;
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.*;
/**
@@ -56,13 +49,8 @@
@Validated
public class MesQcOqcServiceImpl implements MesQcOqcService {
- private static final int WAIT_RETEST = 10, WAIT_SALES = 20, WAIT_COMPANY = 30,
- RELEASED = 40, WAIT_SALES_FAIL = 50, WAIT_COMPANY_FAIL = 60, REJECTED = 70;
-
@Resource
private MesQcOqcMapper oqcMapper;
- @Resource
- private MesQcOqcActionMapper actionMapper;
@Resource
private MesQcTemplateItemService templateItemService;
@@ -145,114 +133,25 @@
@Transactional(rollbackFor = Exception.class)
public void finishOqc(Long id) {
// 1.1 鏍￠獙瀛樺湪 + 鑽夌鐘舵��
- MesQcOqcDO oqc = lock(id);
- if (!MesQcStatusEnum.DRAFT.getStatus().equals(oqc.getStatus())) throw exception(QC_OQC_NOT_PREPARE);
+ MesQcOqcDO oqc = validateOqcStatusPrepare(id);
// 1.2 鏍￠獙妫�娴嬬粨璁哄繀濉�
if (oqc.getCheckResult() == null) {
throw exception(QC_OQC_CHECK_RESULT_EMPTY);
- }
- if (oqc.getUnqualifiedQuantity() != null && oqc.getUnqualifiedQuantity().compareTo(BigDecimal.ZERO) > 0
- && MesQcCheckResultEnum.QUALIFIED.getType().equals(oqc.getCheckResult())) {
- throw new IllegalArgumentException("瀛樺湪涓嶅悎鏍煎搧鏃讹紝鍑鸿揣妫�楠岀粨璁轰笉鑳戒负鍚堟牸");
- }
- if ((oqc.getUnqualifiedQuantity() == null || oqc.getUnqualifiedQuantity().compareTo(BigDecimal.ZERO) == 0)
- && !MesQcCheckResultEnum.QUALIFIED.getType().equals(oqc.getCheckResult())) {
- throw new IllegalArgumentException("涓嶅悎鏍兼暟閲忎负 0 鏃讹紝鍑鸿揣妫�楠岀粨璁哄繀椤讳负鍚堟牸");
}
// 1.3 鏍￠獙鑷冲皯瀛樺湪涓�鏉℃娴嬬粨鏋�
indicatorResultService.validateIndicatorResultExistsByQcIdAndType(id, MesQcTypeEnum.OQC.getType());
// 2. 鏇存柊鐘舵�佷负宸插畬鎴�
MesQcOqcDO updateObj = new MesQcOqcDO()
- .setId(id).setStatus(MesQcStatusEnum.FINISHED.getStatus())
- .setWorkflowStatus(MesQcCheckResultEnum.QUALIFIED.getType().equals(oqc.getCheckResult()) ? WAIT_SALES : WAIT_RETEST);
+ .setId(id).setStatus(MesQcStatusEnum.FINISHED.getStatus());
oqcMapper.updateById(updateObj);
- recordAction(id, "INITIAL", oqc.getCheckResult(), null, oqc);
- // 閿�鍞嚭搴撴槑缁嗕粛涓哄緟妫�锛涘叕鍙歌川妫�瀹℃壒閫氳繃鍚庢墠鍥炲啓骞跺厑璁稿悗缁嚭搴撱��
- }
- @Override
- @Transactional(rollbackFor = Exception.class)
- public void retestOqc(MesQcOqcRetestReqVO req) {
- MesQcOqcDO oqc = requireStatus(req.getId(), WAIT_RETEST);
- if (req.getCheckQuantity().compareTo(req.getQualifiedQuantity().add(req.getUnqualifiedQuantity())) != 0)
- throw new IllegalArgumentException("妫�娴嬫暟閲忓繀椤荤瓑浜庡悎鏍间笌涓嶅悎鏍兼暟閲忎箣鍜�");
- if (req.getCheckQuantity().compareTo(oqc.getOutQuantity()) > 0)
- throw new IllegalArgumentException("妫�娴嬫暟閲忎笉鑳借秴杩囧嚭璐ф暟閲�");
- if (!Set.of(1, 2).contains(req.getCheckResult())) throw new IllegalArgumentException("澶嶆缁撹鍙兘涓哄悎鏍兼垨涓嶅悎鏍�");
- boolean passed = req.getCheckResult() == 1;
- if (passed != (req.getUnqualifiedQuantity().compareTo(BigDecimal.ZERO) == 0))
- throw new IllegalArgumentException("澶嶆缁撹涓庝笉鍚堟牸鏁伴噺涓嶄竴鑷�");
- if (!passed && (req.getOpinion() == null || req.getOpinion().isBlank()))
- throw new IllegalArgumentException("澶嶆涓嶅悎鏍煎繀椤诲～鍐欏師鍥�");
- MesQcOqcDO update = new MesQcOqcDO().setId(req.getId())
- .setCheckQuantity(req.getCheckQuantity()).setQualifiedQuantity(req.getQualifiedQuantity())
- .setUnqualifiedQuantity(req.getUnqualifiedQuantity()).setCheckResult(req.getCheckResult())
- .setInspectDate(LocalDateTime.now()).setInspectorUserId(getLoginUserId())
- .setWorkflowStatus(passed ? WAIT_SALES : WAIT_SALES_FAIL);
- oqcMapper.updateById(update);
- recordAction(req.getId(), "RETEST", req.getCheckResult(), req.getOpinion(), update);
- }
+ // 3. 涓嶅悎鏍兼椂鑷姩鍒涘缓 NCR
+ generateNcrIfNeeded(oqc);
- @Override
- @Transactional(rollbackFor = Exception.class)
- public void salesApprove(Long id, boolean approved, String opinion) {
- MesQcOqcDO oqc = lock(id);
- if (!Set.of(WAIT_SALES, WAIT_SALES_FAIL).contains(oqc.getWorkflowStatus()))
- throw new IllegalArgumentException("褰撳墠鐘舵�佷笉鑳借繘琛岄攢鍞儴瀹℃壒");
- requireOpinion(opinion);
- int next = approved ? (oqc.getWorkflowStatus() == WAIT_SALES ? WAIT_COMPANY : WAIT_COMPANY_FAIL) : WAIT_RETEST;
- oqcMapper.updateById(new MesQcOqcDO().setId(id).setWorkflowStatus(next));
- recordAction(id, approved ? "SALES_APPROVE" : "SALES_REJECT", oqc.getCheckResult(), opinion, oqc);
+ // 4. 鍥炲啓鏉ユ簮鍗曟嵁
+ writeBackSourceDoc(oqc);
}
-
- @Override
- @Transactional(rollbackFor = Exception.class)
- public void companyApprove(Long id, boolean approved, String opinion) {
- MesQcOqcDO oqc = lock(id);
- if (!Set.of(WAIT_COMPANY, WAIT_COMPANY_FAIL).contains(oqc.getWorkflowStatus()))
- throw new IllegalArgumentException("褰撳墠鐘舵�佷笉鑳借繘琛屽叕鍙歌川妫�瀹℃壒");
- requireOpinion(opinion);
- if (approved) {
- if (oqc.getWorkflowStatus() == WAIT_COMPANY_FAIL) generateNcrIfNeeded(oqc);
- writeBackSourceDoc(oqc);
- }
- int next = approved ? (oqc.getWorkflowStatus() == WAIT_COMPANY ? RELEASED : REJECTED) : WAIT_RETEST;
- oqcMapper.updateById(new MesQcOqcDO().setId(id).setWorkflowStatus(next));
- recordAction(id, approved ? "COMPANY_APPROVE" : "COMPANY_REJECT", oqc.getCheckResult(), opinion, oqc);
- }
-
- private MesQcOqcDO lock(Long id) {
- MesQcOqcDO oqc = oqcMapper.selectByIdForUpdate(id);
- if (oqc == null) throw exception(QC_OQC_NOT_EXISTS);
- return oqc;
- }
-
- private MesQcOqcDO requireStatus(Long id, int status) {
- MesQcOqcDO oqc = lock(id);
- if (!Objects.equals(oqc.getWorkflowStatus(), status))
- throw new IllegalArgumentException("閿�鍞川妫�鐘舵�佸凡鍙樺寲锛岃鍒锋柊鍚庨噸璇�");
- return oqc;
- }
-
- private void requireOpinion(String opinion) {
- if (opinion == null || opinion.isBlank()) throw new IllegalArgumentException("璇峰～鍐欏鎵规剰瑙�");
- }
-
- private void recordAction(Long id, String action, Integer result, String opinion, MesQcOqcDO snapshot) {
- MesQcOqcActionDO event = new MesQcOqcActionDO();
- event.setOqcId(id);event.setAction(action);event.setResult(result);event.setOpinion(opinion);
- java.util.Map<String, BigDecimal> quantities = new java.util.HashMap<>();
- quantities.put("checkQuantity", snapshot.getCheckQuantity());
- quantities.put("qualifiedQuantity", snapshot.getQualifiedQuantity());
- quantities.put("unqualifiedQuantity", snapshot.getUnqualifiedQuantity());
- event.setQuantitiesJson(JSONUtil.toJsonStr(quantities));
- event.setOperatorId(getLoginUserId());event.setCreateTime(LocalDateTime.now());
- actionMapper.insert(event);
- }
-
- @Override
- public List<MesQcOqcActionDO> getActions(Long id) { return actionMapper.selectByOqcId(id); }
/**
* 涓嶅悎鏍兼椂鑷姩鍒涘缓 NCR锛堜笉鍚堟牸鍝佸鐞嗗崟锛�
--
Gitblit v1.9.3