From a76bfe866c705285b737d593e8629a8be819b8f7 Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期二, 18 八月 2026 14:49:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_business' into dev_business
---
yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/service/item/MdmItemServiceImpl.java | 181 ++++++++++++++++++++++++++++++++++++++------
1 files changed, 154 insertions(+), 27 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 dc40a64..138b8e0 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
@@ -5,11 +5,14 @@
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.framework.mybatis.core.mapper.BaseMapperX;
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;
@@ -18,12 +21,16 @@
import cn.iocoder.yudao.module.mes.api.item.MesMdItemTypeApi;
import cn.iocoder.yudao.module.mes.api.item.dto.MesMdItemSyncReqDTO;
import cn.iocoder.yudao.module.mes.api.item.dto.MesMdItemTypeRespDTO;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import jakarta.annotation.Resource;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated;
import java.util.*;
+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;
@@ -32,7 +39,7 @@
/**
* MDM 鐗╂枡涓绘暟鎹� Service 瀹炵幇绫�
*
- * @author 鑺嬮亾婧愮爜
+ * @author 瓒呯骇绠＄悊鍛�
*/
@Service
@Validated
@@ -49,9 +56,14 @@
private MdmBrandService brandService;
@Resource
+ @Lazy
private MesMdItemApi mesMdItemApi;
@Resource
+ private MdmItemBatchConfigMapper itemBatchConfigMapper;
+
+ @Resource
private MesMdItemTypeApi mesMdItemTypeApi;
+
@Override
@Transactional(rollbackFor = Exception.class)
@@ -63,8 +75,12 @@
MdmItemDO item = BeanUtils.toBean(createReqVO, MdmItemDO.class);
itemMapper.insert(item);
- // 鍚屾鍒� MES锛堝嬀閫� syncMes 鏃讹級
+ // 淇濆瓨鎵规閰嶇疆锛堝鏋滄湁锛�
+ saveBatchConfig(item.getId(), createReqVO);
+
+ // 鍕鹃�夊悓姝ユ椂锛屽悓姝ュ埌 MES
if (Boolean.TRUE.equals(createReqVO.getSyncMes())) {
+ createReqVO.setId(item.getId());
syncItemToMes(createReqVO);
}
return item.getId();
@@ -82,9 +98,14 @@
MdmItemDO updateObj = BeanUtils.toBean(updateReqVO, MdmItemDO.class);
itemMapper.updateById(updateObj);
- // 鍚屾鍒� MES锛堝嬀閫� syncMes 鏃讹級
+ // 淇濆瓨鎵规閰嶇疆锛堝鏋滄湁锛�
+ saveBatchConfig(updateReqVO.getId(), updateReqVO);
+
+ // 鏍规嵁鍚屾寮�鍏冲喅瀹氾細鎵撳紑鍒欏悓姝ュ埌 MES锛屽叧闂垯鍙栨秷鍚屾锛堜粠 MES 鍒犻櫎锛�
if (Boolean.TRUE.equals(updateReqVO.getSyncMes())) {
syncItemToMes(updateReqVO);
+ } else {
+ mesMdItemApi.deleteItem(updateReqVO.getId());
}
}
@@ -110,29 +131,16 @@
}
unitCode = unitMeasure.getCode();
}
- // 瑙ｆ瀽鍒嗙被 id -> code锛堜娇鐢� MES 鐗╂枡鍒嗙被 API锛�
+ // 瑙ｆ瀽鍒嗙被 id -> code锛堜娇鐢� MDM 鏈湴鍒嗙被鏈嶅姟锛�
String itemTypeCode = null;
if (reqVO.getCategoryId() != null) {
- CommonResult<MesMdItemTypeRespDTO> result = mesMdItemTypeApi.getItemType(reqVO.getCategoryId());
- if (result != null && result.isSuccess() && result.getData() != null) {
- itemTypeCode = result.getData().getCode();
- }
- } else if (reqVO.getItemType() != null) {
- // 鏍规嵁 itemType 鏌ユ壘瀵瑰簲鍒嗙被缂栫爜
- // itemType: 1鍘熸枡, 2鍗婃垚鍝�, 3鎴愬搧, 4杈呮枡
- String itemTypeName = convertItemTypeToName(reqVO.getItemType());
- CommonResult<List<MesMdItemTypeRespDTO>> listResult = mesMdItemTypeApi.getItemTypeList(null);
- if (listResult != null && listResult.isSuccess() && listResult.getData() != null) {
- itemTypeCode = listResult.getData().stream()
- .filter(c -> c.getName() != null && c.getName().equals(itemTypeName))
- .findFirst()
- .map(MesMdItemTypeRespDTO::getCode)
- .orElse(null);
- }
+ CommonResult<MesMdItemTypeRespDTO> itemType = mesMdItemTypeApi.getItemType(reqVO.getCategoryId());
+ itemTypeCode = itemType.getData().getCode();
}
// 缁勮鍚屾 DTO
MesMdItemSyncReqDTO syncReqDTO = new MesMdItemSyncReqDTO();
syncReqDTO.setCode(reqVO.getCode());
+ syncReqDTO.setMdmItemId(reqVO.getId());
syncReqDTO.setName(reqVO.getName());
syncReqDTO.setSpecification(reqVO.getSpecification());
syncReqDTO.setUnitCode(unitCode);
@@ -142,7 +150,16 @@
syncReqDTO.setMaxStock(reqVO.getMaxStock());
syncReqDTO.setHighValue(reqVO.getIsHighValue());
syncReqDTO.setBatchFlag(reqVO.getIsBatchManaged());
+ syncReqDTO.setStatus(reqVO.getStatus());
syncReqDTO.setRemark(reqVO.getRemark());
+ // 鎵规閰嶇疆瀛楁
+ syncReqDTO.setProduceDateFlag(reqVO.getProduceDateFlag());
+ syncReqDTO.setExpireDateFlag(reqVO.getExpireDateFlag());
+ syncReqDTO.setReceiptDateFlag(reqVO.getReceiptDateFlag());
+ syncReqDTO.setVendorFlag(reqVO.getVendorFlag());
+ syncReqDTO.setPurchaseOrderCodeFlag(reqVO.getPurchaseOrderCodeFlag());
+ syncReqDTO.setLotNumberFlag(reqVO.getLotNumberFlag());
+ syncReqDTO.setQualityStatusFlag(reqVO.getQualityStatusFlag());
// create 璧� createItem锛寀pdate 璧� updateItem锛圡ES 渚ф寜 code upsert锛�
if (reqVO.getId() == null) {
mesMdItemApi.createItem(syncReqDTO);
@@ -152,11 +169,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
@@ -164,13 +184,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
@@ -205,8 +278,9 @@
if (categoryId == null) {
return;
}
- CommonResult<MesMdItemTypeRespDTO> result = mesMdItemTypeApi.getItemType(categoryId);
- if (result == null || !result.isSuccess() || result.getData() == null) {
+ // 浣跨敤 MDM 鏈湴鍒嗙被鏈嶅姟鏍￠獙
+ MdmItemCategoryDO category = itemCategoryService.getItemCategory(categoryId);
+ if (category == null) {
throw exception(MDM_ITEM_CATEGORY_NOT_EXISTS);
}
}
@@ -295,4 +369,57 @@
return itemMapper.selectByCode(code);
}
+ @Override
+ public List<MdmItemDO> getItemSimpleList() {
+ return itemMapper.selectList(MdmItemDO::getStatus,
+ cn.iocoder.yudao.framework.common.enums.CommonStatusEnum.ENABLE.getStatus());
+ }
+
+ /**
+ * 淇濆瓨鎵规閰嶇疆锛堝埌 MDM 鏈湴琛級
+ */
+ private void saveBatchConfig(Long itemId, MdmItemSaveReqVO reqVO) {
+ // 妫�鏌ユ槸鍚︽湁鎵规閰嶇疆鏁版嵁
+ if (reqVO.getProduceDateFlag() == null
+ && reqVO.getExpireDateFlag() == null
+ && reqVO.getReceiptDateFlag() == null
+ && reqVO.getVendorFlag() == null
+ && reqVO.getPurchaseOrderCodeFlag() == null
+ && reqVO.getLotNumberFlag() == null
+ && reqVO.getQualityStatusFlag() == null) {
+ return;
+ }
+
+ // 鏌ヨ宸叉湁閰嶇疆
+ cn.iocoder.yudao.module.mdm.dal.dataobject.item.MdmItemBatchConfigDO existing =
+ itemBatchConfigMapper.selectOne(
+ cn.iocoder.yudao.module.mdm.dal.dataobject.item.MdmItemBatchConfigDO::getItemId, itemId);
+
+ cn.iocoder.yudao.module.mdm.dal.dataobject.item.MdmItemBatchConfigDO config =
+ new cn.iocoder.yudao.module.mdm.dal.dataobject.item.MdmItemBatchConfigDO();
+ config.setItemId(itemId);
+ config.setProduceDateFlag(Boolean.TRUE.equals(reqVO.getProduceDateFlag()));
+ config.setExpireDateFlag(Boolean.TRUE.equals(reqVO.getExpireDateFlag()));
+ config.setReceiptDateFlag(Boolean.TRUE.equals(reqVO.getReceiptDateFlag()));
+ config.setVendorFlag(Boolean.TRUE.equals(reqVO.getVendorFlag()));
+ config.setPurchaseOrderCodeFlag(Boolean.TRUE.equals(reqVO.getPurchaseOrderCodeFlag()));
+ config.setLotNumberFlag(Boolean.TRUE.equals(reqVO.getLotNumberFlag()));
+ config.setQualityStatusFlag(Boolean.TRUE.equals(reqVO.getQualityStatusFlag()));
+ // 娓呯┖涓嶉渶瑕佺殑瀛楁
+ config.setClientFlag(false);
+ config.setSalesOrderCodeFlag(false);
+ config.setWorkOrderFlag(false);
+ config.setTaskFlag(false);
+ config.setWorkstationFlag(false);
+ config.setToolFlag(false);
+ config.setMoldFlag(false);
+
+ if (existing != null) {
+ config.setId(existing.getId());
+ itemBatchConfigMapper.updateById(config);
+ } else {
+ itemBatchConfigMapper.insert(config);
+ }
+ }
+
}
\ No newline at end of file
--
Gitblit v1.9.3