From 3aa3f9e730127147236c9e7627920dd8aacf3a36 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 15 七月 2026 15:49:59 +0800
Subject: [PATCH] 1.仓储物流-批次号优化覆盖数据 2.仓储物流-新增自定义出入库流水查询 3.采购管理-清理无用代码和表 4.销售管理-清理无用代码和表 5.销售流程状态字段数据回游
---
yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/service/item/MdmItemServiceImpl.java | 98 ++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 80 insertions(+), 18 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..9b32fc6 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
@@ -2,7 +2,6 @@
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ObjUtil;
-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.mdm.controller.admin.item.vo.MdmItemPageReqVO;
@@ -10,20 +9,21 @@
import cn.iocoder.yudao.module.mdm.dal.dataobject.category.MdmItemCategoryDO;
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.MesMdItemTypeApi;
import cn.iocoder.yudao.module.mes.api.item.dto.MesMdItemSyncReqDTO;
-import cn.iocoder.yudao.module.mes.api.item.dto.MesMdItemTypeRespDTO;
import jakarta.annotation.Resource;
+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;
@@ -49,9 +49,10 @@
private MdmBrandService brandService;
@Resource
+ @Lazy
private MesMdItemApi mesMdItemApi;
@Resource
- private MesMdItemTypeApi mesMdItemTypeApi;
+ private MdmItemBatchConfigMapper itemBatchConfigMapper;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -62,6 +63,9 @@
// 鎻掑叆 MDM 鐗╂枡
MdmItemDO item = BeanUtils.toBean(createReqVO, MdmItemDO.class);
itemMapper.insert(item);
+
+ // 淇濆瓨鎵规閰嶇疆锛堝鏋滄湁锛�
+ saveBatchConfig(item.getId(), createReqVO);
// 鍚屾鍒� MES锛堝嬀閫� syncMes 鏃讹級
if (Boolean.TRUE.equals(createReqVO.getSyncMes())) {
@@ -81,6 +85,9 @@
// 鏇存柊 MDM 鐗╂枡
MdmItemDO updateObj = BeanUtils.toBean(updateReqVO, MdmItemDO.class);
itemMapper.updateById(updateObj);
+
+ // 淇濆瓨鎵规閰嶇疆锛堝鏋滄湁锛�
+ saveBatchConfig(updateReqVO.getId(), updateReqVO);
// 鍚屾鍒� MES锛堝嬀閫� syncMes 鏃讹級
if (Boolean.TRUE.equals(updateReqVO.getSyncMes())) {
@@ -110,25 +117,24 @@
}
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();
+ 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());
- 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);
- }
+ 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();
@@ -143,6 +149,14 @@
syncReqDTO.setHighValue(reqVO.getIsHighValue());
syncReqDTO.setBatchFlag(reqVO.getIsBatchManaged());
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);
@@ -205,8 +219,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 +310,51 @@
return itemMapper.selectByCode(code);
}
+ /**
+ * 淇濆瓨鎵规閰嶇疆锛堝埌 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