From 1ab2b329a40decba8ff7eefbeb158ff259aceb6d Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期二, 14 七月 2026 15:23:34 +0800
Subject: [PATCH] 追溯+分类接口
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/md/unitmeasure/MesMdUnitMeasureServiceImpl.java | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 56 insertions(+), 2 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/md/unitmeasure/MesMdUnitMeasureServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/md/unitmeasure/MesMdUnitMeasureServiceImpl.java
index 139fb12..05be23e 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/md/unitmeasure/MesMdUnitMeasureServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/md/unitmeasure/MesMdUnitMeasureServiceImpl.java
@@ -1,6 +1,7 @@
package cn.iocoder.yudao.module.mes.service.md.unitmeasure;
import cn.hutool.core.collection.CollUtil;
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
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.md.unitmeasure.vo.MesMdUnitMeasurePageReqVO;
@@ -14,6 +15,8 @@
import cn.iocoder.yudao.module.mes.service.qc.oqc.MesQcOqcLineService;
import cn.iocoder.yudao.module.mes.service.qc.rqc.MesQcRqcLineService;
import cn.iocoder.yudao.module.mes.service.qc.template.MesQcTemplateIndicatorService;
+import cn.iocoder.yudao.module.mdm.api.unit.MdmUnitMeasureApi;
+import cn.iocoder.yudao.module.mdm.api.unit.dto.MdmUnitMeasureRespDTO;
import org.springframework.context.annotation.Lazy;
import jakarta.annotation.Resource;
import org.springframework.stereotype.Service;
@@ -23,6 +26,7 @@
import java.util.Collections;
import java.util.List;
import java.util.Objects;
+import java.util.stream.Collectors;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.*;
@@ -30,11 +34,16 @@
/**
* MES 璁￠噺鍗曚綅 Service 瀹炵幇绫�
*
+ * 娉ㄦ剰锛氭煡璇㈡搷浣滅粺涓�浣跨敤 MDM API 鑾峰彇鏁版嵁锛屼繚鎸佷笌 MDM 涓绘暟鎹竴鑷�
+ *
* @author 鑺嬮亾婧愮爜
*/
@Service
@Validated
public class MesMdUnitMeasureServiceImpl implements MesMdUnitMeasureService {
+
+ @Resource
+ private MdmUnitMeasureApi unitMeasureApi;
@Resource
private MesMdUnitMeasureMapper unitMeasureMapper;
@@ -138,16 +147,28 @@
@Override
public MesMdUnitMeasureDO getUnitMeasure(Long id) {
- return unitMeasureMapper.selectById(id);
+ // 浼樺厛浠� MDM API 鑾峰彇
+ CommonResult<MdmUnitMeasureRespDTO> result = unitMeasureApi.getUnitMeasure(id);
+ if (result != null && result.isSuccess() && result.getData() != null) {
+ return convertToDo(result.getData());
+ }
+ // 濡傛灉 MDM API 澶辫触锛屽洖閫�鍒版湰鍦版暟鎹簱
+ MesMdUnitMeasureDO local = unitMeasureMapper.selectById(id);
+ if (local != null) {
+ return local;
+ }
+ return null;
}
@Override
public PageResult<MesMdUnitMeasureDO> getUnitMeasurePage(MesMdUnitMeasurePageReqVO pageReqVO) {
+ // 浣跨敤鏈湴鏁版嵁搴撳垎椤垫煡璇紙MDM API 涓嶆敮鎸佸垎椤靛弬鏁帮級
return unitMeasureMapper.selectPage(pageReqVO);
}
@Override
public List<MesMdUnitMeasureDO> getUnitMeasureListByStatus(Integer status) {
+ // 浣跨敤鏈湴鏁版嵁搴撴煡璇紙MDM API 涓嶆敮鎸佹寜鐘舵�佽繃婊わ級
return unitMeasureMapper.selectListByStatus(status);
}
@@ -156,12 +177,45 @@
if (CollUtil.isEmpty(ids)) {
return Collections.emptyList();
}
+ // 浼樺厛浠� MDM API 鑾峰彇
+ CommonResult<List<MdmUnitMeasureRespDTO>> result = unitMeasureApi.getUnitMeasureList(ids);
+ if (result != null && result.isSuccess() && result.getData() != null) {
+ return result.getData().stream()
+ .map(this::convertToDo)
+ .collect(Collectors.toList());
+ }
+ // 濡傛灉 MDM API 澶辫触锛屽洖閫�鍒版湰鍦版暟鎹簱
return unitMeasureMapper.selectByIds(ids);
}
@Override
public MesMdUnitMeasureDO getUnitMeasureByCode(String code) {
- return unitMeasureMapper.selectByCode(code);
+ // 浼樺厛浠� MDM API 鑾峰彇
+ CommonResult<MdmUnitMeasureRespDTO> result = unitMeasureApi.getUnitMeasureByCode(code);
+ if (result != null && result.isSuccess() && result.getData() != null) {
+ return convertToDo(result.getData());
+ }
+ // 濡傛灉 MDM API 澶辫触锛屽洖閫�鍒版湰鍦版暟鎹簱
+ MesMdUnitMeasureDO local = unitMeasureMapper.selectByCode(code);
+ if (local != null) {
+ return local;
+ }
+ return null;
+ }
+
+ /**
+ * 灏� MDM DTO 杞崲涓� MES DO
+ */
+ private MesMdUnitMeasureDO convertToDo(MdmUnitMeasureRespDTO dto) {
+ MesMdUnitMeasureDO doObj = new MesMdUnitMeasureDO();
+ doObj.setId(dto.getId());
+ doObj.setCode(dto.getCode());
+ doObj.setName(dto.getName());
+ doObj.setPrimaryFlag(dto.getPrimaryFlag());
+ doObj.setPrimaryId(dto.getPrimaryId());
+ doObj.setChangeRate(dto.getChangeRate());
+ doObj.setStatus(dto.getStatus());
+ return doObj;
}
}
--
Gitblit v1.9.3