From 0f792c9b3b88dc4b1b7b306f89e257d931d2d0bd Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期六, 18 七月 2026 15:38:57 +0800
Subject: [PATCH] 代码提交
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/materialstock/MesWmMaterialStockServiceImpl.java | 21 ++++++++++++++++++---
1 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/materialstock/MesWmMaterialStockServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/materialstock/MesWmMaterialStockServiceImpl.java
index f78cdbd..b62bbec 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/materialstock/MesWmMaterialStockServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/materialstock/MesWmMaterialStockServiceImpl.java
@@ -9,6 +9,7 @@
import cn.iocoder.yudao.module.mes.controller.admin.wm.materialstock.vo.MesWmMaterialStockFreezeReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.materialstock.vo.MesWmMaterialStockListReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.materialstock.vo.MesWmMaterialStockPageReqVO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdItemDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.mdm.MesMdmItemDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdItemTypeDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.materialstock.MesWmMaterialStockDO;
@@ -17,6 +18,7 @@
import cn.iocoder.yudao.module.mes.dal.mysql.wm.materialstock.MesWmMaterialStockMapper;
import cn.iocoder.yudao.module.mes.enums.MesBizTypeConstants;
import cn.iocoder.yudao.module.mes.enums.wm.MesWmTransactionTypeEnum;
+import cn.iocoder.yudao.module.mes.service.md.item.MesMdItemService;
import cn.iocoder.yudao.module.mes.service.mdm.MesMdmItemService;
import cn.iocoder.yudao.module.mes.service.md.item.MesMdItemTypeService;
import cn.iocoder.yudao.module.mes.service.wm.batch.MesWmBatchService;
@@ -52,6 +54,8 @@
@Resource
private MesMdmItemService mdmItemService;
+ @Resource
+ private MesMdItemService mdItemService;
@Resource
private MesMdItemTypeService itemTypeService;
@Resource
@@ -94,10 +98,13 @@
List<MesMdItemTypeDO> children = itemTypeService.getItemTypeChildrenList(pageReqVO.getItemTypeId());
itemTypeIds.addAll(convertSet(children, MesMdItemTypeDO::getId));
}
- // 1.2 瑙ｆ瀽 itemId
+ // 1.2 瑙ｆ瀽 itemId锛氬墠绔紶鐨勬槸 mes_md_item.id锛屽簱瀛樿〃瀛樼殑鏄� mdm_item_id锛岄渶瑕佽浆鎹�
Set<Long> itemIds = null;
if (pageReqVO.getItemId() != null) {
- itemIds = SetUtils.asSet(pageReqVO.getItemId());
+ MesMdItemDO item = mdItemService.getItem(pageReqVO.getItemId());
+ if (item != null && item.getMdmItemId() != null) {
+ itemIds = SetUtils.asSet(item.getMdmItemId());
+ }
}
// 1.3 瑙ｆ瀽 virtualFilter锛氳浆鎹负铏氭嫙浠� warehouseId
Long virtualWarehouseId = null;
@@ -181,7 +188,15 @@
.frozen(false)
.build();
materialStockMapper.insert(newStock);
- return newStock;
+ // 3. 閲嶆柊鏌ヨ锛岀‘淇濇嬁鍒版暟鎹簱鐢熸垚鐨勫畬鏁磋褰曪紙id銆乧reateTime 绛夛級
+ MesWmMaterialStockDO inserted = materialStockMapper.selectById(newStock.getId());
+ return inserted != null ? inserted : newStock;
+ }
+
+ @Override
+ public MesWmMaterialStockDO getMaterialStockByCompositeKey(Long itemId, Long warehouseId, Long locationId, Long areaId,
+ Long batchId, Long vendorId) {
+ return materialStockMapper.selectByCompositeKey(itemId, warehouseId, locationId, areaId, batchId, vendorId);
}
@Override
--
Gitblit v1.9.3