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-mes/src/main/java/cn/iocoder/yudao/module/mes/service/md/item/MesMdItemBatchConfigServiceImpl.java | 86 ++++++++++++++++++++++++++++++++++---------
1 files changed, 68 insertions(+), 18 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/md/item/MesMdItemBatchConfigServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/md/item/MesMdItemBatchConfigServiceImpl.java
index 84010c6..a78ef74 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/md/item/MesMdItemBatchConfigServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/md/item/MesMdItemBatchConfigServiceImpl.java
@@ -4,9 +4,14 @@
import cn.iocoder.yudao.module.mes.controller.admin.md.item.vo.batchconfig.MesMdItemBatchConfigSaveReqVO;
import cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdItemBatchConfigDO;
import cn.iocoder.yudao.module.mes.dal.mysql.md.item.MesMdItemBatchConfigMapper;
+import cn.iocoder.yudao.module.mdm.api.item.MdmItemApi;
+import cn.iocoder.yudao.module.mdm.api.item.MdmItemBatchConfigApi;
+import cn.iocoder.yudao.module.mdm.api.item.dto.MdmItemBatchConfigRespDTO;
+import cn.iocoder.yudao.module.mdm.dal.dataobject.item.MdmItemBatchConfigDO;
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 static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
@@ -15,6 +20,9 @@
/**
* MES 鐗╂枡鎵规灞炴�ч厤缃� Service 瀹炵幇绫�
+ *
+ * 鎵规閰嶇疆缁熶竴瀛樺偍鍦� MDM 琛紙mdm_item_batch_config锛�
+ * MES 鏈湴琛紙mes_md_item_batch_config锛変粎鐢ㄤ簬鍏煎鍘嗗彶鏁版嵁鍜� MES 妯″潡鍐呴儴鏌ヨ
*
* @author 鑺嬮亾婧愮爜
*/
@@ -26,12 +34,29 @@
private MesMdItemBatchConfigMapper itemBatchConfigMapper;
@Resource
- @Lazy // 閬垮厤寰幆渚濊禆锛圡esMdItemServiceImpl 涔熶細娉ㄥ叆鏈� Service锛�
+ @Lazy
private MesMdItemService itemService;
+
+ @Resource
+ @Lazy
+ private MdmItemApi mdmItemApi;
+
+ @Resource
+ private MdmItemBatchConfigApi mdmItemBatchConfigApi;
@Override
public MesMdItemBatchConfigDO getItemBatchConfigByItemId(Long itemId) {
- return itemBatchConfigMapper.selectByItemId(itemId);
+ // 浼樺厛浠� MES 鏈湴琛ㄦ煡璇紙鎬ц兘鏇村ソ锛�
+ MesMdItemBatchConfigDO mesConfig = itemBatchConfigMapper.selectByItemId(itemId);
+ if (mesConfig != null) {
+ return mesConfig;
+ }
+ // 鏈湴琛ㄤ笉瀛樺湪锛屽皾璇曚粠 MDM 鑾峰彇锛堜笉鍐欏叆鏈湴锛岄伩鍏嶅壇浣滅敤锛�
+ MdmItemBatchConfigRespDTO mdmConfig = mdmItemBatchConfigApi.getItemBatchConfig(itemId);
+ if (mdmConfig != null) {
+ return BeanUtils.toBean(mdmConfig, MesMdItemBatchConfigDO.class);
+ }
+ return null;
}
@Override
@@ -44,26 +69,33 @@
}
@Override
+ @Transactional(rollbackFor = Exception.class)
public Long saveItemBatchConfig(MesMdItemBatchConfigSaveReqVO saveReqVO) {
- // 1. 鏍￠獙鐗╂枡瀛樺湪
- if (itemService.getItem(saveReqVO.getItemId()) == null) {
+ // 1. 鏍￠獙鐗╂枡瀛樺湪锛堜粠 MDM 鏍￠獙锛�
+ if (mdmItemApi.getItem(saveReqVO.getItemId()).getCheckedData() == null) {
throw exception(MD_ITEM_NOT_EXISTS);
}
- // 2. 鏌ヨ宸叉湁閰嶇疆锛屽喅瀹氭柊澧炶繕鏄洿鏂�
- MesMdItemBatchConfigDO existing = itemBatchConfigMapper.selectByItemId(saveReqVO.getItemId());
- if (existing != null) {
- // 鏇存柊
- MesMdItemBatchConfigDO updateObj = BeanUtils.toBean(saveReqVO, MesMdItemBatchConfigDO.class);
- updateObj.setId(existing.getId());
- itemBatchConfigMapper.updateById(updateObj);
- return existing.getId();
- }
+ // 2. 娓呯┖涓嶉渶瑕佺殑瀛楁锛堝彧淇濈暀蹇呰鐨�7涓瓧娈碉級
+ MesMdItemBatchConfigSaveReqVO cleanReqVO = new MesMdItemBatchConfigSaveReqVO();
+ cleanReqVO.setId(saveReqVO.getId());
+ cleanReqVO.setItemId(saveReqVO.getItemId());
+ cleanReqVO.setProduceDateFlag(saveReqVO.getProduceDateFlag());
+ cleanReqVO.setExpireDateFlag(saveReqVO.getExpireDateFlag());
+ cleanReqVO.setReceiptDateFlag(saveReqVO.getReceiptDateFlag());
+ cleanReqVO.setVendorFlag(saveReqVO.getVendorFlag());
+ cleanReqVO.setPurchaseOrderCodeFlag(saveReqVO.getPurchaseOrderCodeFlag());
+ cleanReqVO.setLotNumberFlag(saveReqVO.getLotNumberFlag());
+ cleanReqVO.setQualityStatusFlag(saveReqVO.getQualityStatusFlag());
- // 鏂板
- MesMdItemBatchConfigDO insertObj = BeanUtils.toBean(saveReqVO, MesMdItemBatchConfigDO.class);
- itemBatchConfigMapper.insert(insertObj);
- return insertObj.getId();
+ // 3. 淇濆瓨鍒� MDM 琛�
+ MdmItemBatchConfigDO mdmConfig = BeanUtils.toBean(cleanReqVO, MdmItemBatchConfigDO.class);
+ Long configId = mdmItemBatchConfigApi.saveItemBatch(mdmConfig);
+
+ // 4. 鍚屾淇濆瓨鍒� MES 鏈湴琛�
+ saveToMesTable(cleanReqVO);
+
+ return configId;
}
@Override
@@ -71,4 +103,22 @@
itemBatchConfigMapper.deleteByItemId(itemId);
}
-}
+ /**
+ * 淇濆瓨鍒� MES 鏈湴琛�
+ */
+ private void saveToMesTable(MesMdItemBatchConfigSaveReqVO saveReqVO) {
+ MesMdItemBatchConfigDO existing = itemBatchConfigMapper.selectByItemId(saveReqVO.getItemId());
+ MesMdItemBatchConfigDO mesConfig = BeanUtils.toBean(saveReqVO, MesMdItemBatchConfigDO.class);
+
+ if (existing != null) {
+ // 瀛樺湪鍒欐洿鏂帮紝浣跨敤宸叉湁鐨� ID
+ mesConfig.setId(existing.getId());
+ itemBatchConfigMapper.updateById(mesConfig);
+ } else {
+ // 涓嶅瓨鍦ㄥ垯鎻掑叆锛岃鏁版嵁搴撹嚜鍔ㄧ敓鎴� ID
+ mesConfig.setId(null);
+ itemBatchConfigMapper.insert(mesConfig);
+ }
+ }
+
+}
\ No newline at end of file
--
Gitblit v1.9.3