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/item/MesMdItemServiceImpl.java | 57 +++++++++++++++++++++++++++++++--------------------------
1 files changed, 31 insertions(+), 26 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 7585be0..860e5b2 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,8 +6,6 @@
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;
@@ -40,9 +38,7 @@
/**
* MES 鐗╂枡浜у搧 Service 瀹炵幇绫�
*
- * 鏀归�犺鏄庯細MES 鐗╂枡涓绘暟鎹潵婧愪簬 MDM
- * - getItem/getItemList/validateItemExists 璋冪敤 MDM API
- * - MES 鐗规湁閰嶇疆锛堟壒娆￠厤缃�丅OM銆丼OP銆丼IP锛変繚鐣欏湪 MES 妯″潡绠＄悊
+ * 娉ㄦ剰锛氬綋鍓嶄繚鎸佷娇鐢� MES 鏈湴琛紝寰� MDM 鏁版嵁杩佺Щ瀹屾垚鍚庡啀鍒囨崲鍒� MDM API
*
* @author 鑺嬮亾婧愮爜
*/
@@ -52,9 +48,6 @@
@Resource
private MesMdItemMapper itemMapper;
-
- @Resource
- private MdmItemApi mdmItemApi;
@Resource
private MesMdItemTypeService itemTypeService;
@@ -156,14 +149,20 @@
@Override
public MesMdItemDO validateItemExists(Long id) {
- MdmItemRespDTO item = mdmItemApi.validateItemExists(id).getCheckedData();
- return BeanUtils.toBean(item, MesMdItemDO.class);
+ MesMdItemDO item = itemMapper.selectById(id);
+ if (item == null) {
+ throw exception(MD_ITEM_NOT_EXISTS);
+ }
+ return item;
}
@Override
public MesMdItemDO validateItemExistsAndEnable(Long id) {
- MdmItemRespDTO item = mdmItemApi.validateItemExistsAndEnable(id).getCheckedData();
- return BeanUtils.toBean(item, MesMdItemDO.class);
+ MesMdItemDO item = validateItemExists(id);
+ if (ObjUtil.notEqual(CommonStatusEnum.ENABLE.getStatus(), item.getStatus())) {
+ throw exception(MD_ITEM_IS_DISABLE);
+ }
+ return item;
}
private void validateItemCodeUnique(Long id, String code) {
@@ -242,18 +241,26 @@
@Override
public MesMdItemDO getItem(Long id) {
- // 浠� MDM 鑾峰彇鐗╂枡涓绘暟鎹�
- MdmItemRespDTO item = mdmItemApi.getItem(id).getCheckedData();
- return BeanUtils.toBean(item, MesMdItemDO.class);
+ return itemMapper.selectById(id);
+ }
+
+ @Override
+ public MesMdItemDO getItemByCode(String code) {
+ return itemMapper.selectByCode(code);
}
@Override
public PageResult<MesMdItemDO> getItemPage(MesMdItemPageReqVO pageReqVO) {
- // 璋冪敤 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());
+ // 鏌ユ壘鏃讹紝濡傛灉鏌ユ壘鏌愪釜鍒嗙被缂栧彿锛屽垯鍖呭惈瀹冪殑瀛愬垎绫�
+ 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);
}
@Override
@@ -261,19 +268,17 @@
if (CollUtil.isEmpty(ids)) {
return Collections.emptyList();
}
- List<MdmItemRespDTO> itemList = mdmItemApi.getItemList(ids).getCheckedData();
- return BeanUtils.toBean(itemList, MesMdItemDO.class);
+ return itemMapper.selectByIds(ids);
}
@Override
public Long getItemCountByItemTypeId(Long itemTypeId) {
- // MES 鍒嗙被闇�瑕佹槧灏勫埌 MDM 鍒嗙被
- return mdmItemApi.getItemCountByCategoryId(itemTypeId).getCheckedData();
+ return itemMapper.selectCountByItemTypeId(itemTypeId);
}
@Override
public Long getItemCountByUnitMeasureId(Long unitMeasureId) {
- return mdmItemApi.getItemCountByUnitMeasureId(unitMeasureId).getCheckedData();
+ return itemMapper.selectCountByUnitMeasureId(unitMeasureId);
}
@Override
@@ -364,4 +369,4 @@
return respVO;
}
-}
+}
\ No newline at end of file
--
Gitblit v1.9.3