From 657698fd2fb32794932474648dbaee9e284e38c8 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期一, 12 十月 2026 18:31:20 +0800
Subject: [PATCH] feat(bpm): 添加全局免审批功能支持
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/oqc/MesQcOqcServiceImpl.java | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 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 0f21b7d..7ffb1e8 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
@@ -3,9 +3,11 @@
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ObjUtil;
import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
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.operatelog.core.util.OperateLogUtils;
import cn.iocoder.yudao.module.mes.controller.admin.qc.oqc.vo.MesQcOqcImportExcelVO;
import cn.iocoder.yudao.module.mes.controller.admin.qc.oqc.vo.MesQcOqcPageReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.qc.oqc.vo.MesQcOqcSaveReqVO;
@@ -34,6 +36,7 @@
import cn.iocoder.yudao.module.crm.api.customer.CrmCustomerApi;
import cn.iocoder.yudao.module.mdm.api.item.MdmItemApi;
import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
+import com.mzt.logapi.starter.annotation.LogRecord;
import jakarta.annotation.Resource;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
@@ -51,6 +54,7 @@
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.*;
+import static cn.iocoder.yudao.module.mes.enums.LogRecordConstants.*;
/**
* MES 鍑鸿揣妫�楠屽崟锛圤QC锛� Service 瀹炵幇绫�
@@ -144,7 +148,11 @@
updateObj.setSourceDocType(null).setSourceDocId(null).setSourceLineId(null); // 涓嶅厑璁镐慨鏀规潵婧愬崟鎹�
updateObj.setTemplateId(null); // 涓嶅厑璁镐慨鏀规ā鏉�
updateObj.setItemId(null); // 涓嶅厑璁镐慨鏀圭墿鏂�
- oqcMapper.updateById(updateObj);
+ // 缂栬緫鏃跺厑璁告竻绌哄鎴凤紱瀹屾垚妫�楠岀瓑灞�閮ㄦ洿鏂颁粛淇濈暀鍘熷鎴枫��
+ updateObj.setClientId(null);
+ oqcMapper.update(updateObj, new LambdaUpdateWrapper<MesQcOqcDO>()
+ .eq(MesQcOqcDO::getId, updateReqVO.getId())
+ .set(MesQcOqcDO::getClientId, updateReqVO.getClientId()));
}
private void validateOqcSaveData(MesQcOqcSaveReqVO reqVO) {
@@ -413,10 +421,14 @@
@Override
@Transactional(rollbackFor = Exception.class)
+ @LogRecord(type = MES_QC_OQC_TYPE, subType = MES_QC_OQC_IMPORT_SUB_TYPE, bizNo = "0",
+ success = MES_QC_OQC_IMPORT_SUCCESS)
public MesQcImportRespVO importOqcList(List<MesQcOqcImportExcelVO> importList) {
MesQcImportRespVO respVO = MesQcImportRespVO.builder()
.createList(new ArrayList<>()).failureList(new LinkedHashMap<>()).build();
if (CollUtil.isEmpty(importList)) {
+ // 绌烘枃浠朵篃瑕佺粰鏃ュ織鏂囨鍏滃簳锛岄伩鍏� {{#importSummary}} 鍙栦笉鍒板��
+ OperateLogUtils.putImportSummary(respVO.getCreateList(), null, respVO.getFailureList());
return respVO;
}
qcImportHelper.startImport();
@@ -440,6 +452,8 @@
respVO.getFailureList().put(label, MesQcImportHelper.resolveImportErrorMessage(ex));
}
}
+ // 璁板綍瀵煎叆缁撴灉姹囨�伙紝渚� @LogRecord 鐨� success 鏂囨寮曠敤
+ OperateLogUtils.putImportSummary(respVO.getCreateList(), null, respVO.getFailureList());
return respVO;
}
@@ -476,7 +490,7 @@
reqVO.setName(row.getName().trim());
reqVO.setItemId(qcImportHelper.resolveItemId(row.getItemCode()));
Long clientId = qcImportHelper.resolveClientId(row.getClientName());
- qcImportHelper.validateClientPermission(clientId, row.getClientName().trim());
+ qcImportHelper.validateClientPermission(clientId, StrUtil.trimToEmpty(row.getClientName()));
reqVO.setClientId(clientId);
reqVO.setBatchCode(StrUtil.trimToNull(row.getBatchCode()));
reqVO.setTemplateId(qcImportHelper.resolveTemplateId(row.getTemplateName()));
--
Gitblit v1.9.3