From 6e3d8e950e7dec3551bee3512673e1fc2d384d2b Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期日, 18 十月 2026 20:25:55 +0800
Subject: [PATCH] fix(mes): 修复能耗抄表控制器启动时的 bean 名称冲突
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnvendor/MesWmReturnVendorServiceImpl.java | 127 ++++++++++++++++++++++++++++++++++++++++--
1 files changed, 121 insertions(+), 6 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnvendor/MesWmReturnVendorServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnvendor/MesWmReturnVendorServiceImpl.java
index 37f56fb..a05baf6 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnvendor/MesWmReturnVendorServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnvendor/MesWmReturnVendorServiceImpl.java
@@ -2,10 +2,13 @@
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ObjUtil;
+import cn.hutool.core.util.StrUtil;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.framework.common.util.object.ObjectUtils;
+import cn.iocoder.yudao.module.mes.controller.admin.wm.returnvendor.vo.MesWmReturnVendorImportExcelVO;
+import cn.iocoder.yudao.module.mes.controller.admin.wm.returnvendor.vo.MesWmReturnVendorImportRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.returnvendor.vo.MesWmReturnVendorPageReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.returnvendor.vo.MesWmReturnVendorSaveReqVO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.returnvendor.MesWmReturnVendorDO;
@@ -18,16 +21,25 @@
import cn.iocoder.yudao.module.srm.api.supplier.SrmSupplierApi;
import cn.iocoder.yudao.module.mes.service.wm.transaction.MesWmTransactionService;
import cn.iocoder.yudao.module.mes.service.wm.transaction.dto.MesWmTransactionSaveReqDTO;
+import cn.iocoder.yudao.module.system.api.approval.ApprovalConfigApi;
+import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
+import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
import jakarta.annotation.Resource;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated;
import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
import java.util.List;
+import java.util.Set;
+import java.util.concurrent.atomic.AtomicInteger;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList;
+import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.*;
/**
@@ -35,7 +47,15 @@
*/
@Service
@Validated
+@Slf4j
public class MesWmReturnVendorServiceImpl implements MesWmReturnVendorService {
+
+ /**
+ * 渚涘簲鍟嗛��璐у崟瀹℃壒鐨勪笟鍔＄被鍨嬬紪鐮�
+ *
+ * 涓� system_approval_config.biz_type 瀵瑰簲锛屽鏍镐汉鍦ㄣ�岀郴缁熺鐞� - 瀹℃壒閰嶇疆銆嶄腑缁存姢銆�
+ */
+ private static final String RETURN_VENDOR_APPROVE_BIZ_TYPE = "return_vendor_approve";
@Resource
private MesWmReturnVendorMapper returnVendorMapper;
@@ -48,6 +68,10 @@
private SrmSupplierApi srmSupplierApi;
@Resource
private MesWmTransactionService wmTransactionService;
+ @Resource
+ private AdminUserApi adminUserApi;
+ @Resource
+ private ApprovalConfigApi approvalConfigApi;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -99,18 +123,63 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public void submitReturnVendor(Long id) {
- // 鏍￠獙瀛樺湪 + 鑽夌鐘舵��
+ public void submitReturnVendorApproval(Long id) {
+ // 1. 鏍￠獙瀛樺湪 + 鑽夌鐘舵��
validateReturnVendorExistsAndPrepare(id);
- // 鏍￠獙鑷冲皯鏈変竴鏉¤
+ // 2. 鏍￠獙鑷冲皯鏈変竴鏉¤
List<MesWmReturnVendorLineDO> lines = returnVendorLineService.getReturnVendorLineListByReturnId(id);
if (CollUtil.isEmpty(lines)) {
throw exception(WM_RETURN_VENDOR_NO_LINE);
}
+ // 3. 鏍￠獙瀹℃壒閰嶇疆宸插惎鐢ㄤ笖閰嶇疆浜嗘湁鏁堝鏍镐汉锛堟湭閰嶇疆鏃舵姏鍑哄甫鏄庣‘鎻愮ず鐨勪笟鍔″紓甯革級
+ approvalConfigApi.validateApprovalEnabledAndGetApprovers(RETURN_VENDOR_APPROVE_BIZ_TYPE);
+ // 4. 鎻愪氦瀹℃壒锛堣崏绋� 鈫� 寰呮嫞璐э級锛屽苟娓呯┖涓婁竴杞鏍哥粨鏋�
+ returnVendorMapper.submitAndResetAuditInfo(id, MesWmReturnVendorStatusEnum.APPROVING.getStatus());
+ }
- // 鎻愪氦锛堣崏绋� -> 寰呮嫞璐э級
- returnVendorMapper.updateById(new MesWmReturnVendorDO()
- .setId(id).setStatus(MesWmReturnVendorStatusEnum.APPROVING.getStatus()));
+ @Override
+ public Set<Long> getReturnVendorApproverUserIds() {
+ return approvalConfigApi.getApproverUserIds(RETURN_VENDOR_APPROVE_BIZ_TYPE);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void auditReturnVendor(Long id, Boolean pass, String reviewRemark) {
+ // 1. 鏍￠獙瀛樺湪
+ MesWmReturnVendorDO returnVendor = validateReturnVendorExists(id);
+ // 2. 鏍￠獙澶勪簬寰呮嫞璐х姸鎬�
+ if (!MesWmReturnVendorStatusEnum.APPROVING.getStatus().equals(returnVendor.getStatus())) {
+ throw exception(WM_RETURN_VENDOR_NOT_APPROVING);
+ }
+ // 3. 鏍￠獙褰撳墠鐧诲綍鐢ㄦ埛鏄涓氬姟绫诲瀷鐨勫鏍镐汉锛堟垨绛撅細浠讳竴浜哄潎鍙鏍革級
+ Long userId = getLoginUserId();
+ approvalConfigApi.validateApprover(RETURN_VENDOR_APPROVE_BIZ_TYPE, userId);
+ // 4. 瀹℃牳涓嶉�氳繃锛氬繀椤诲～鍐欏師鍥狅紝閫�鍥炶崏绋垮彲淇敼鍚庨噸鏂版彁浜�
+ if (!Boolean.TRUE.equals(pass)) {
+ if (StrUtil.isBlank(reviewRemark)) {
+ throw exception(WM_RETURN_VENDOR_REJECT_REASON_REQUIRED);
+ }
+ returnVendorMapper.auditReturnVendor(id, MesWmReturnVendorStatusEnum.PREPARE.getStatus(),
+ userId, getUserNickname(userId), reviewRemark);
+ return;
+ }
+ // 5. 瀹℃牳閫氳繃锛氳褰曞鏍镐汉涓庡鏍告剰瑙侊紝鐘舵�佺疆涓哄緟鎵ц閫�璐э紙鍙畬鎴愰��璐у苟鎵ｅ噺搴撳瓨锛�
+ returnVendorMapper.auditReturnVendor(id, MesWmReturnVendorStatusEnum.APPROVED.getStatus(),
+ userId, getUserNickname(userId), reviewRemark);
+ }
+
+ /**
+ * 鑾峰彇鐢ㄦ埛鏄电О
+ *
+ * @param userId 鐢ㄦ埛缂栧彿
+ * @return 鏄电О锛岀敤鎴蜂笉瀛樺湪鏃惰繑鍥� null
+ */
+ private String getUserNickname(Long userId) {
+ if (userId == null) {
+ return null;
+ }
+ AdminUserRespDTO user = adminUserApi.getUser(userId);
+ return user == null ? null : user.getNickname();
}
@Override
@@ -240,4 +309,50 @@
return returnVendorMapper.selectCountByVendorId(vendorId);
}
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public MesWmReturnVendorImportRespVO importReturnVendorList(List<MesWmReturnVendorImportExcelVO> importList, boolean updateSupport) {
+ if (CollUtil.isEmpty(importList)) {
+ throw exception(WM_RETURN_VENDOR_IMPORT_LIST_IS_EMPTY);
+ }
+ MesWmReturnVendorImportRespVO respVO = MesWmReturnVendorImportRespVO.builder()
+ .createCodes(new ArrayList<>()).updateCodes(new ArrayList<>())
+ .failureCodes(new LinkedHashMap<>()).build();
+ AtomicInteger index = new AtomicInteger(1);
+ importList.forEach(importItem -> {
+ int currentIndex = index.getAndIncrement();
+ String code = importItem.getCode();
+ String key = StrUtil.blankToDefault(code, "绗� " + currentIndex + " 琛�");
+ if (StrUtil.isBlank(code)) {
+ respVO.getFailureCodes().put(key, "鍗曞彿涓嶈兘涓虹┖");
+ return;
+ }
+ if (StrUtil.isBlank(importItem.getName())) {
+ respVO.getFailureCodes().put(key, "鍚嶇О涓嶈兘涓虹┖");
+ return;
+ }
+ MesWmReturnVendorDO existing = returnVendorMapper.selectByCode(code);
+ if (existing != null && updateSupport) {
+ if (!MesWmReturnVendorStatusEnum.PREPARE.getStatus().equals(existing.getStatus())) {
+ respVO.getFailureCodes().put(key, "鍗曟嵁闈炶崏绋跨姸鎬侊紝涓嶅厑璁歌鐩栨洿鏂�");
+ return;
+ }
+ MesWmReturnVendorDO updateObj = BeanUtils.toBean(importItem, MesWmReturnVendorDO.class);
+ updateObj.setId(existing.getId());
+ updateObj.setStatus(existing.getStatus());
+ returnVendorMapper.updateById(updateObj);
+ respVO.getUpdateCodes().add(code);
+ } else if (existing != null) {
+ respVO.getFailureCodes().put(key, "鍗曞彿宸插瓨鍦細" + code);
+ } else {
+ MesWmReturnVendorDO createObj = BeanUtils.toBean(importItem, MesWmReturnVendorDO.class);
+ createObj.setId(null);
+ createObj.setStatus(MesWmReturnVendorStatusEnum.PREPARE.getStatus());
+ returnVendorMapper.insert(createObj);
+ respVO.getCreateCodes().add(code);
+ }
+ });
+ return respVO;
+ }
+
}
--
Gitblit v1.9.3