From f7273277023f3497ac071bf98f556a569cb4dd25 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 17 九月 2026 16:24:10 +0800
Subject: [PATCH] feat(mes): 重构袋码生成与物料分类功能
---
yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/service/item/MdmItemServiceImpl.java | 137 ++++++++++++++++++++++++++-------------------
1 files changed, 80 insertions(+), 57 deletions(-)
diff --git a/yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/service/item/MdmItemServiceImpl.java b/yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/service/item/MdmItemServiceImpl.java
index e210590..3176e2f 100644
--- a/yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/service/item/MdmItemServiceImpl.java
+++ b/yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/service/item/MdmItemServiceImpl.java
@@ -6,13 +6,12 @@
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.module.mdm.controller.admin.item.vo.MdmItemPageReqVO;
import cn.iocoder.yudao.module.mdm.controller.admin.item.vo.MdmItemSaveReqVO;
-import cn.iocoder.yudao.module.mdm.dal.dataobject.category.MdmItemCategoryDO;
+import cn.iocoder.yudao.module.mdm.dal.dataobject.item.MdmItemBatchConfigDO;
import cn.iocoder.yudao.module.mdm.dal.dataobject.item.MdmItemDO;
import cn.iocoder.yudao.module.mdm.dal.dataobject.unit.MdmUnitMeasureDO;
import cn.iocoder.yudao.module.mdm.dal.mysql.item.MdmItemBatchConfigMapper;
import cn.iocoder.yudao.module.mdm.dal.mysql.item.MdmItemMapper;
import cn.iocoder.yudao.module.mdm.service.brand.MdmBrandService;
-import cn.iocoder.yudao.module.mdm.service.category.MdmItemCategoryService;
import cn.iocoder.yudao.module.mdm.service.unit.MdmUnitMeasureService;
import cn.iocoder.yudao.module.mes.api.item.MesMdItemApi;
import cn.iocoder.yudao.module.mes.api.item.dto.MesMdItemSyncReqDTO;
@@ -26,13 +25,12 @@
import java.util.stream.Collectors;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet;
import static cn.iocoder.yudao.module.mdm.enums.ErrorCodeConstants.*;
/**
* MDM 鐗╂枡涓绘暟鎹� Service 瀹炵幇绫�
*
- * @author 鑺嬮亾婧愮爜
+ * @author 瓒呯骇绠＄悊鍛�
*/
@Service
@Validated
@@ -41,8 +39,6 @@
@Resource
private MdmItemMapper itemMapper;
- @Resource
- private MdmItemCategoryService itemCategoryService;
@Resource
private MdmUnitMeasureService unitMeasureService;
@Resource
@@ -53,6 +49,7 @@
private MesMdItemApi mesMdItemApi;
@Resource
private MdmItemBatchConfigMapper itemBatchConfigMapper;
+
@Override
@Transactional(rollbackFor = Exception.class)
@@ -67,8 +64,9 @@
// 淇濆瓨鎵规閰嶇疆锛堝鏋滄湁锛�
saveBatchConfig(item.getId(), createReqVO);
- // 鍚屾鍒� MES锛堝嬀閫� syncMes 鏃讹級
+ // 鍕鹃�夊悓姝ユ椂锛屽悓姝ュ埌 MES
if (Boolean.TRUE.equals(createReqVO.getSyncMes())) {
+ createReqVO.setId(item.getId());
syncItemToMes(createReqVO);
}
return item.getId();
@@ -89,9 +87,11 @@
// 淇濆瓨鎵规閰嶇疆锛堝鏋滄湁锛�
saveBatchConfig(updateReqVO.getId(), updateReqVO);
- // 鍚屾鍒� MES锛堝嬀閫� syncMes 鏃讹級
+ // 鏍规嵁鍚屾寮�鍏冲喅瀹氾細鎵撳紑鍒欏悓姝ュ埌 MES锛屽叧闂垯鍙栨秷鍚屾锛堜粠 MES 鍒犻櫎锛�
if (Boolean.TRUE.equals(updateReqVO.getSyncMes())) {
syncItemToMes(updateReqVO);
+ } else {
+ mesMdItemApi.deleteItem(updateReqVO.getId());
}
}
@@ -101,10 +101,9 @@
}
/**
- * 鍚屾鐗╂枡鍒� MES锛堝崟浣�/鍒嗙被鎸� code 鏄犲皠锛�
+ * 鍚屾鐗╂枡鍒� MES锛堝崟浣嶆寜 code 鏄犲皠锛�
*
- * MDM 鐨� unitMeasureId/categoryId 涓� MES 鐨� unitMeasureId/itemTypeId 鍒嗗睘涓ゅ涓绘暟鎹紝
- * 杩欓噷鍏堝湪 MDM 渚цВ鏋愬嚭 code锛屽啀浜ょ敱 MesMdItemApi 鍦� MES 渚цВ鏋愪负瀵瑰簲 id銆�
+ * 鍝佺绠＄悊宸插幓鎺夈�屽搧绉嶅垎绫汇�嶅瓧娈碉紝鍚屾涓嶅啀浼犻�� MES 鐗╂枡鍒嗙被锛坕tem_type_id 鐣欑┖锛屽彲鍦� MES 渚цˉ濉級銆�
* 鍚屾澶辫触灏嗘姏鍑哄紓甯革紝瑙﹀彂澶栧眰 @Transactional 鏁翠綋鍥炴粴锛圡DM 鎿嶄綔涓�骞跺洖婊氾級銆�
*/
private void syncItemToMes(MdmItemSaveReqVO reqVO) {
@@ -117,37 +116,19 @@
}
unitCode = unitMeasure.getCode();
}
- // 瑙ｆ瀽鍒嗙被 id -> code锛堜娇鐢� MDM 鏈湴鍒嗙被鏈嶅姟锛�
- String itemTypeCode = null;
- if (reqVO.getCategoryId() != null) {
- MdmItemCategoryDO category = itemCategoryService.getItemCategory(reqVO.getCategoryId());
- if (category != null) {
- itemTypeCode = category.getCode();
- }
- } else if (reqVO.getItemType() != null) {
- // 鏍规嵁 itemType 鏌ユ壘瀵瑰簲鍒嗙被缂栫爜
- // itemType: 1鍘熸枡, 2鍗婃垚鍝�, 3鎴愬搧, 4杈呮枡
- String itemTypeName = convertItemTypeToName(reqVO.getItemType());
- List<MdmItemCategoryDO> categories = itemCategoryService.getItemCategoryList(
- itemCategoryService.getItemCategoryChildrenList(null).stream().map(MdmItemCategoryDO::getId).collect(Collectors.toSet()));
- itemTypeCode = categories.stream()
- .filter(c -> c.getName() != null && c.getName().equals(itemTypeName))
- .findFirst()
- .map(MdmItemCategoryDO::getCode)
- .orElse(null);
- }
// 缁勮鍚屾 DTO
MesMdItemSyncReqDTO syncReqDTO = new MesMdItemSyncReqDTO();
syncReqDTO.setCode(reqVO.getCode());
+ syncReqDTO.setMdmItemId(reqVO.getId());
syncReqDTO.setName(reqVO.getName());
syncReqDTO.setSpecification(reqVO.getSpecification());
syncReqDTO.setUnitCode(unitCode);
- syncReqDTO.setItemTypeCode(itemTypeCode);
syncReqDTO.setSafeStockFlag(Boolean.TRUE); // 淇濈暀 MDM 鐨� minStock/maxStock锛岄伩鍏嶈 MES 娓呴浂
syncReqDTO.setMinStock(reqVO.getMinStock());
syncReqDTO.setMaxStock(reqVO.getMaxStock());
syncReqDTO.setHighValue(reqVO.getIsHighValue());
syncReqDTO.setBatchFlag(reqVO.getIsBatchManaged());
+ syncReqDTO.setStatus(reqVO.getStatus());
syncReqDTO.setRemark(reqVO.getRemark());
// 鎵规閰嶇疆瀛楁
syncReqDTO.setProduceDateFlag(reqVO.getProduceDateFlag());
@@ -166,11 +147,14 @@
}
@Override
+ @Transactional(rollbackFor = Exception.class)
public void updateItemStatus(Long id, Integer status) {
// 鏍￠獙瀛樺湪
validateItemExists(id);
// 鏇存柊鐘舵��
itemMapper.updateById(new MdmItemDO().setId(id).setStatus(status));
+ // 鍚屾鐘舵�佸埌 MES
+ mesMdItemApi.updateItemStatus(id, status);
}
@Override
@@ -178,13 +162,66 @@
public void deleteItem(Long id) {
// 鏍￠獙瀛樺湪
MdmItemDO item = validateItemExists(id);
- // 瑙ｅ喅杞垹闄ゅ敮涓�閿啿绐侊細濡傛灉宸插瓨鍦ㄧ浉鍚� code 涓斿凡杞垹闄ょ殑璁板綍锛屽厛鐗╃悊鍒犻櫎瀹�
-// MdmItemDO existingDeleted = itemMapper.selectByCodeAndDeleted(item.getCode(), true);
-// if (existingDeleted != null && !existingDeleted.getId().equals(id)) {
-// itemMapper.physicalDeleteById(existingDeleted.getId());
-// }
+ // 鏍￠獙鐗╂枡鏄惁琚笟鍔″紩鐢�
+ validateItemNoReference(id);
// 杞垹闄ゅ綋鍓嶈褰�
itemMapper.deleteById(id);
+ // 鍚屾鍒犻櫎鍒� MES
+ mesMdItemApi.deleteItem(id);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void updateItemSync(Long id, Boolean sync) {
+ // 鏍￠獙瀛樺湪
+ MdmItemDO item = validateItemExists(id);
+ if (Boolean.TRUE.equals(sync)) {
+ // 鍚屾鍒� MES锛氫粠 DB 璇诲彇瀹屾暣鐗╂枡鏁版嵁缁勮鍚庤蛋 syncItemToMes
+ MdmItemSaveReqVO reqVO = BeanUtils.toBean(item, MdmItemSaveReqVO.class);
+ // DO 瀛楁鍚嶄负 highValue锛屼笌 VO 鐨� isHighValue 涓嶈嚜鍔ㄥ尮閰嶏紝鎵嬪姩琛ラ綈
+ reqVO.setIsHighValue(item.getHighValue());
+ // 琛ラ綈鎵规灞炴�ч厤缃�
+ MdmItemBatchConfigDO config = itemBatchConfigMapper.selectOne(
+ MdmItemBatchConfigDO::getItemId, id);
+ if (config != null) {
+ reqVO.setProduceDateFlag(config.getProduceDateFlag());
+ reqVO.setExpireDateFlag(config.getExpireDateFlag());
+ reqVO.setReceiptDateFlag(config.getReceiptDateFlag());
+ reqVO.setVendorFlag(config.getVendorFlag());
+ reqVO.setPurchaseOrderCodeFlag(config.getPurchaseOrderCodeFlag());
+ reqVO.setLotNumberFlag(config.getLotNumberFlag());
+ reqVO.setQualityStatusFlag(config.getQualityStatusFlag());
+ }
+ syncItemToMes(reqVO);
+ } else {
+ // 鍙栨秷鍚屾锛氫粠 MES 鍒犻櫎璇ョ墿鏂欙紙MES 鏃犳鐗╂枡鏃跺唴閮ㄤ负绌烘搷浣滐級
+ mesMdItemApi.deleteItem(id);
+ }
+ }
+
+ /**
+ * 鏍￠獙鐗╂枡鏈涓氬姟寮曠敤锛堥攢鍞�侀噰璐�佺敓浜с�佽川妫�銆佸簱瀛樼瓑锛�
+ *
+ * @param id 鐗╂枡缂栧彿
+ */
+ private void validateItemNoReference(Long id) {
+ List<Map<String, Object>> references = itemMapper.selectItemReferenceCount(id);
+ if (CollUtil.isNotEmpty(references)) {
+ String refDesc = references.stream()
+ .map(r -> r.get("source") + "(" + r.get("cnt") + ")")
+ .collect(Collectors.joining("銆�"));
+ throw exception(MDM_ITEM_EXISTS_REFERENCE, refDesc);
+ }
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void deleteItemList(Collection<Long> ids) {
+ if (CollUtil.isEmpty(ids)) {
+ return;
+ }
+ // 閫愪釜鍒犻櫎锛堝鐢ㄥ崟鏉″垹闄ら�昏緫锛屼繚鎸佹牎楠岋級
+ ids.forEach(this::deleteItem);
}
@Override
@@ -212,17 +249,6 @@
}
if (ObjUtil.notEqual(item.getId(), id)) {
throw exception(MDM_ITEM_CODE_DUPLICATE);
- }
- }
-
- private void validateCategoryExists(Long categoryId) {
- if (categoryId == null) {
- return;
- }
- // 浣跨敤 MDM 鏈湴鍒嗙被鏈嶅姟鏍￠獙
- MdmItemCategoryDO category = itemCategoryService.getItemCategory(categoryId);
- if (category == null) {
- throw exception(MDM_ITEM_CATEGORY_NOT_EXISTS);
}
}
@@ -269,17 +295,8 @@
@Override
public PageResult<MdmItemDO> getItemPage(MdmItemPageReqVO pageReqVO) {
- // 鏌ユ壘鏃讹紝濡傛灉鏌ユ壘鏌愪釜鍒嗙被缂栧彿锛屽垯鍖呭惈瀹冪殑瀛愬垎绫�
- Set<Long> categoryIds = null;
- if (pageReqVO.getCategoryId() != null) {
- categoryIds = new HashSet<>();
- categoryIds.add(pageReqVO.getCategoryId());
- List<cn.iocoder.yudao.module.mdm.dal.dataobject.category.MdmItemCategoryDO> children =
- itemCategoryService.getItemCategoryChildrenList(pageReqVO.getCategoryId());
- categoryIds.addAll(convertSet(children, cn.iocoder.yudao.module.mdm.dal.dataobject.category.MdmItemCategoryDO::getId));
- }
// 鍒嗛〉鏌ヨ
- return itemMapper.selectPage(pageReqVO, categoryIds);
+ return itemMapper.selectPage(pageReqVO, (Collection<Long>) null);
}
@Override
@@ -310,6 +327,12 @@
return itemMapper.selectByCode(code);
}
+ @Override
+ public List<MdmItemDO> getItemSimpleList() {
+ return itemMapper.selectList(MdmItemDO::getStatus,
+ cn.iocoder.yudao.framework.common.enums.CommonStatusEnum.ENABLE.getStatus());
+ }
+
/**
* 淇濆瓨鎵规閰嶇疆锛堝埌 MDM 鏈湴琛級
*/
--
Gitblit v1.9.3