From 940c8481d2fdcf51341db4ccd6fd6fcc2d43debb Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期一, 29 六月 2026 15:32:58 +0800
Subject: [PATCH] 初始化项目
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/md/item/MesMdItemServiceImpl.java | 50 ++++++++++++++++++++++++++------------------------
1 files changed, 26 insertions(+), 24 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/md/item/MesMdItemServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/md/item/MesMdItemServiceImpl.java
index 81f2dee..7585be0 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/md/item/MesMdItemServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/md/item/MesMdItemServiceImpl.java
@@ -6,6 +6,8 @@
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.module.mdm.api.item.MdmItemApi;
+import cn.iocoder.yudao.module.mdm.api.item.dto.MdmItemRespDTO;
import cn.iocoder.yudao.module.mes.controller.admin.md.item.vo.MesMdItemImportExcelVO;
import cn.iocoder.yudao.module.mes.controller.admin.md.item.vo.MesMdItemImportRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.md.item.vo.MesMdItemPageReqVO;
@@ -38,6 +40,10 @@
/**
* MES 鐗╂枡浜у搧 Service 瀹炵幇绫�
*
+ * 鏀归�犺鏄庯細MES 鐗╂枡涓绘暟鎹潵婧愪簬 MDM
+ * - getItem/getItemList/validateItemExists 璋冪敤 MDM API
+ * - MES 鐗规湁閰嶇疆锛堟壒娆¢厤缃�丅OM銆丼OP銆丼IP锛変繚鐣欏湪 MES 妯″潡绠$悊
+ *
* @author 鑺嬮亾婧愮爜
*/
@Service
@@ -46,6 +52,9 @@
@Resource
private MesMdItemMapper itemMapper;
+
+ @Resource
+ private MdmItemApi mdmItemApi;
@Resource
private MesMdItemTypeService itemTypeService;
@@ -147,20 +156,14 @@
@Override
public MesMdItemDO validateItemExists(Long id) {
- MesMdItemDO item = itemMapper.selectById(id);
- if (item == null) {
- throw exception(MD_ITEM_NOT_EXISTS);
- }
- return item;
+ MdmItemRespDTO item = mdmItemApi.validateItemExists(id).getCheckedData();
+ return BeanUtils.toBean(item, MesMdItemDO.class);
}
@Override
public MesMdItemDO validateItemExistsAndEnable(Long id) {
- MesMdItemDO item = validateItemExists(id);
- if (ObjUtil.notEqual(CommonStatusEnum.ENABLE.getStatus(), item.getStatus())) {
- throw exception(MD_ITEM_IS_DISABLE);
- }
- return item;
+ MdmItemRespDTO item = mdmItemApi.validateItemExistsAndEnable(id).getCheckedData();
+ return BeanUtils.toBean(item, MesMdItemDO.class);
}
private void validateItemCodeUnique(Long id, String code) {
@@ -239,21 +242,18 @@
@Override
public MesMdItemDO getItem(Long id) {
- return itemMapper.selectById(id);
+ // 浠� MDM 鑾峰彇鐗╂枡涓绘暟鎹�
+ MdmItemRespDTO item = mdmItemApi.getItem(id).getCheckedData();
+ return BeanUtils.toBean(item, MesMdItemDO.class);
}
@Override
public PageResult<MesMdItemDO> getItemPage(MesMdItemPageReqVO pageReqVO) {
- // 鏌ユ壘鏃讹紝濡傛灉鏌ユ壘鏌愪釜鍒嗙被缂栧彿锛屽垯鍖呭惈瀹冪殑瀛愬垎绫�
- Set<Long> itemTypeIds = null;
- if (pageReqVO.getItemTypeId() != null) {
- itemTypeIds = new HashSet<>();
- itemTypeIds.add(pageReqVO.getItemTypeId());
- List<MesMdItemTypeDO> children = itemTypeService.getItemTypeChildrenList(pageReqVO.getItemTypeId());
- itemTypeIds.addAll(convertSet(children, MesMdItemTypeDO::getId));
- }
- // 鍒嗛〉鏌ヨ
- return itemMapper.selectPage(pageReqVO, itemTypeIds);
+ // 璋冪敤 MDM API 鍒嗛〉鏌ヨ锛圡ES 鐗╂枡瀵瑰簲 MDM 鐗╂枡绫诲瀷=鐗╂枡锛�
+ cn.iocoder.yudao.framework.common.pojo.PageResult<MdmItemRespDTO> mdmPageResult =
+ mdmItemApi.getItemPage(1, pageReqVO.getStatus(), pageReqVO.getPageNo(), pageReqVO.getPageSize()).getCheckedData();
+ List<MesMdItemDO> itemList = BeanUtils.toBean(mdmPageResult.getList(), MesMdItemDO.class);
+ return new PageResult<>(itemList, mdmPageResult.getTotal());
}
@Override
@@ -261,17 +261,19 @@
if (CollUtil.isEmpty(ids)) {
return Collections.emptyList();
}
- return itemMapper.selectByIds(ids);
+ List<MdmItemRespDTO> itemList = mdmItemApi.getItemList(ids).getCheckedData();
+ return BeanUtils.toBean(itemList, MesMdItemDO.class);
}
@Override
public Long getItemCountByItemTypeId(Long itemTypeId) {
- return itemMapper.selectCountByItemTypeId(itemTypeId);
+ // MES 鍒嗙被闇�瑕佹槧灏勫埌 MDM 鍒嗙被
+ return mdmItemApi.getItemCountByCategoryId(itemTypeId).getCheckedData();
}
@Override
public Long getItemCountByUnitMeasureId(Long unitMeasureId) {
- return itemMapper.selectCountByUnitMeasureId(unitMeasureId);
+ return mdmItemApi.getItemCountByUnitMeasureId(unitMeasureId).getCheckedData();
}
@Override
--
Gitblit v1.9.3