From 06c312e584b99df613728d5ea8b32df4e156f3cc Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期一, 07 九月 2026 17:40:09 +0800
Subject: [PATCH] feat(mes): 采购退货关联采购订单后自动带入物料并锁定选料

---
 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/materialstock/MesWmMaterialStockService.java |   32 ++++++++++++++++++++++++++++++++
 1 files changed, 32 insertions(+), 0 deletions(-)

diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/materialstock/MesWmMaterialStockService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/materialstock/MesWmMaterialStockService.java
index 8ad1a45..f58e2a5 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/materialstock/MesWmMaterialStockService.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/materialstock/MesWmMaterialStockService.java
@@ -3,6 +3,8 @@
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.module.mes.controller.admin.wm.materialstock.vo.MesWmMaterialStockAdjustReqVO;
 import cn.iocoder.yudao.module.mes.controller.admin.wm.materialstock.vo.MesWmMaterialStockFreezeReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.wm.materialstock.vo.MesWmMaterialStockImportExcelVO;
+import cn.iocoder.yudao.module.mes.controller.admin.wm.materialstock.vo.MesWmMaterialStockImportRespVO;
 import cn.iocoder.yudao.module.mes.controller.admin.wm.materialstock.vo.MesWmMaterialStockListReqVO;
 import cn.iocoder.yudao.module.mes.controller.admin.wm.materialstock.vo.MesWmMaterialStockMoveReqVO;
 import cn.iocoder.yudao.module.mes.controller.admin.wm.materialstock.vo.MesWmMaterialStockPageReqVO;
@@ -115,6 +117,24 @@
                                                   Long batchId, String batchCode, Long vendorId, LocalDateTime receiptTime);
 
     /**
+     * 鍒涘缓鏂扮殑搴撳瓨璁板綍锛堜笉鏌ユ壘宸叉湁璁板綍锛屽缁堝垱寤烘柊璁板綍锛�
+     *
+     * 鐢ㄤ簬閫�鏂欑瓑鍦烘櫙锛岄渶瑕佷负姣忔閫�鏂欏垱寤虹嫭绔嬬殑搴撳瓨璁板綍
+     *
+     * @param itemId      鐗╂枡缂栧彿
+     * @param warehouseId 浠撳簱缂栧彿
+     * @param locationId  搴撳尯缂栧彿
+     * @param areaId      搴撲綅缂栧彿
+     * @param batchId     鎵规缂栧彿
+     * @param batchCode   鎵规鍙�
+     * @param vendorId    渚涘簲鍟嗙紪鍙�
+     * @param receiptTime 鍏ュ簱鏃堕棿锛堜负绌哄垯榛樿褰撳墠鏃堕棿锛�
+     * @return 鏂板垱寤虹殑搴撳瓨璁板綍
+     */
+    MesWmMaterialStockDO createMaterialStock(Long itemId, Long warehouseId, Long locationId, Long areaId,
+                                              Long batchId, String batchCode, Long vendorId, LocalDateTime receiptTime);
+
+    /**
      * 鎸夌粍鍚堥敭鏌ユ壘搴撳瓨璁板綍锛堝彧鏌ヤ笉鍒涘缓锛�
      *
      * @param itemId      鐗╂枡缂栧彿
@@ -187,4 +207,16 @@
      */
     void moveMaterialStock(@Valid MesWmMaterialStockMoveReqVO reqVO);
 
+    /**
+     * 瀵煎叆搴撳瓨鐜版湁閲�
+     * <p>
+     * 姣忚閫氳繃銆屾搷浣滅被鍨嬨�嶆帶鍒讹細澧炲姞/鍑忓皯 鎸夊彉鍔ㄩ噺璋冩暣鍦ㄥ簱鏁伴噺锛涜鐩� 鎸夌洰鏍囧�煎樊棰濊皟鏁淬��
+     * 鎸夈�岀墿鏂欑紪鐮� + 浠撳簱 + 搴撳尯 + 搴撲綅 + 鎵规鍙� + 渚涘簲鍟嗐�嶅畾浣嶅簱瀛樿褰曘��
+     * 姣忚鐙珛浜嬪姟锛氬崟琛屽け璐ヤ笉褰卞搷鍏跺畠琛屻��
+     *
+     * @param importList 瀵煎叆鏁版嵁
+     * @return 瀵煎叆缁撴灉
+     */
+    MesWmMaterialStockImportRespVO importMaterialStockList(List<MesWmMaterialStockImportExcelVO> importList);
+
 }

--
Gitblit v1.9.3