From 0a2206a53d5889b6095f4819c263be858d86ca91 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 29 十月 2026 17:22:31 +0800
Subject: [PATCH] feat(mes): 增加盘号管理和库存搜索功能

---
 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/materialstock/MesWmMaterialStockServiceImpl.java             |   12 ++
 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialstock/vo/MesWmMaterialStockAdjustReqVO.java |    7 +
 yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/wm/materialstock/MesWmMaterialStockReelTest.java                |   43 ++++++++
 yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/wm/returnsales/ReturnSalesManualBatchReelTest.java              |   48 +++++++++
 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialstock/vo/MesWmMaterialStockPageReqVO.java   |    9 +
 yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/wm/materialstock/MesWmMaterialStockSearchTest.java              |   38 +++++++
 yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/wm/productsales/SalesBatchQueryParserTest.java                  |   17 +++
 yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/qc/rqc/MesQcRqcServiceImplTest.java                             |    3 
 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnsales/MesWmReturnSalesLineServiceImpl.java             |    9 +
 yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/wm/returnsales/MesWmReturnSalesLineServiceImplTest.java         |    9 +
 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/materialstock/MesWmMaterialStockMapper.java                |   10 ++
 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/productsales/MesWmProductSalesDetailMapper.java            |    2 
 yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/wm/productsales/MesWmProductSalesOrderWritebackTest.java        |   48 +++++++++
 13 files changed, 249 insertions(+), 6 deletions(-)

diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialstock/vo/MesWmMaterialStockAdjustReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialstock/vo/MesWmMaterialStockAdjustReqVO.java
index 612d289..c7b816d 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialstock/vo/MesWmMaterialStockAdjustReqVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialstock/vo/MesWmMaterialStockAdjustReqVO.java
@@ -4,6 +4,7 @@
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotNull;
 import jakarta.validation.constraints.Positive;
+import jakarta.validation.constraints.Size;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
@@ -43,6 +44,10 @@
     @Schema(description = "鎵规鍙凤紙鏂板缓鎵规鏃朵紶鍏ワ紝绯荤粺鑷姩鍒涘缓鎵规璁板綍锛�", example = "BATCH001")
     private String batchCode;
 
+    @Schema(description = "鐩樺彿锛堟柊寤烘壒娆℃椂鎵嬪伐濉啓锛�", example = "PHCS")
+    @Size(max = 128, message = "鐩樺彿涓嶈兘瓒呰繃128涓瓧绗�")
+    private String reelNo;
+
     @Schema(description = "鐢熶骇鏃ユ湡锛堟柊寤烘壒娆℃椂浼犲叆锛�", example = "2025-01-01")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
     @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY)
@@ -72,4 +77,4 @@
     @Schema(description = "鍘熷洜", example = "鐩樼偣璋冩暣")
     private String reason;
 
-}
\ No newline at end of file
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialstock/vo/MesWmMaterialStockPageReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialstock/vo/MesWmMaterialStockPageReqVO.java
index b5a18ac..fb94af6 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialstock/vo/MesWmMaterialStockPageReqVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialstock/vo/MesWmMaterialStockPageReqVO.java
@@ -30,6 +30,15 @@
     @Schema(description = "鐗╂枡缂栧彿", example = "1")
     private Long itemId;
 
+    @Schema(description = "MDM 鐗╂枡缂栧彿")
+    private Long mdmItemId;
+
+    @Schema(description = "鐗╂枡鍚嶇О鎴栫紪鐮侊紙妯$硦鏌ヨ锛�")
+    private String itemName;
+
+    @Schema(description = "渚涘簲鍟嗗悕绉帮紙妯$硦鏌ヨ锛�")
+    private String vendorName;
+
     @Schema(description = "鎵规鍙�", example = "B20260101")
     private String batchCode;
 
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/materialstock/MesWmMaterialStockMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/materialstock/MesWmMaterialStockMapper.java
index 38a7df2..7444c05 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/materialstock/MesWmMaterialStockMapper.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/materialstock/MesWmMaterialStockMapper.java
@@ -1,6 +1,7 @@
 package cn.iocoder.yudao.module.mes.dal.mysql.wm.materialstock;
 
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.hutool.core.util.StrUtil;
 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.module.mes.controller.admin.wm.materialstock.vo.MesWmMaterialStockListReqVO;
@@ -26,6 +27,7 @@
         LambdaQueryWrapperX<MesWmMaterialStockDO> wrapper = new LambdaQueryWrapperX<MesWmMaterialStockDO>()
                 .inIfPresent(MesWmMaterialStockDO::getItemTypeId, itemTypeIds)
                 .inIfPresent(MesWmMaterialStockDO::getItemId, itemIds)
+                .eqIfPresent(MesWmMaterialStockDO::getItemId, reqVO.getMdmItemId())
                 .likeIfPresent(MesWmMaterialStockDO::getBatchCode, reqVO.getBatchCode())
                 .eqIfPresent(MesWmMaterialStockDO::getBatchId, reqVO.getBatchId())
                 .eqIfPresent(MesWmMaterialStockDO::getWarehouseId, reqVO.getWarehouseId())
@@ -33,6 +35,14 @@
                 .eqIfPresent(MesWmMaterialStockDO::getAreaId, reqVO.getAreaId())
                 .eqIfPresent(MesWmMaterialStockDO::getVendorId, reqVO.getVendorId())
                 .eqIfPresent(MesWmMaterialStockDO::getFrozen, reqVO.getFrozen());
+        if (StrUtil.isNotBlank(reqVO.getItemName())) {
+            String keyword = "%" + reqVO.getItemName().trim() + "%";
+            wrapper.apply("item_id IN (SELECT id FROM mdm_item WHERE (name LIKE {0} OR code LIKE {0}) AND deleted = 0)", keyword);
+        }
+        if (StrUtil.isNotBlank(reqVO.getVendorName())) {
+            wrapper.apply("vendor_id IN (SELECT id FROM srm_supplier WHERE name LIKE {0} AND deleted = 0)",
+                    "%" + reqVO.getVendorName().trim() + "%");
+        }
         wrapper.ne(MesWmMaterialStockDO::getQuantity, BigDecimal.ZERO)
                 .orderByAsc(MesWmMaterialStockDO::getReceiptTime);
         // 铏氭嫙浠撹繃婊わ紙Service 灞傚凡灏� virtualFilter 瑙f瀽涓� virtualWarehouseId锛�
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/productsales/MesWmProductSalesDetailMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/productsales/MesWmProductSalesDetailMapper.java
index 79d304c..b09f18d 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/productsales/MesWmProductSalesDetailMapper.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/productsales/MesWmProductSalesDetailMapper.java
@@ -24,7 +24,7 @@
             + "JOIN mes_wm_batch b ON b.id = d.batch_id AND b.deleted = 0 AND b.item_id = d.item_id "
             + "WHERE d.deleted = 0 AND s.sale_order_id = #{orderId} AND s.status = #{finishedStatus} "
             + "AND d.item_id = #{itemId} AND l.item_id = #{itemId} AND i.product_id = #{itemId} "
-            + "AND BINARY i.reel_no = BINARY b.reel_no "
+            + "AND CAST(i.reel_no AS BINARY) = CAST(b.reel_no AS BINARY) "
             + "AND d.batch_id = #{batchId}")
     Long countFinishedSaleBatch(@Param("orderId") Long orderId, @Param("itemId") Long itemId,
                                 @Param("batchId") Long batchId, @Param("finishedStatus") Integer finishedStatus);
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 ef8e9ff..f083ece 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
@@ -132,6 +132,8 @@
             MesMdItemDO item = mdItemService.getItem(pageReqVO.getItemId());
             if (item != null && item.getMdmItemId() != null) {
                 itemIds = SetUtils.asSet(item.getMdmItemId());
+            } else {
+                return PageResult.empty();
             }
         }
         // 1.3 瑙f瀽 virtualFilter锛氳浆鎹负铏氭嫙浠� warehouseId
@@ -459,11 +461,16 @@
     private MesWmBatchDO resolveBatch(MesWmMaterialStockAdjustReqVO reqVO, MesMdmItemDO item) {
         // 鍗充娇鐗╂枡鏈惎鐢ㄦ櫘閫氭壒娆$鐞嗭紝涔熻淇濈暀骞舵牎楠岀洏鍙疯拷婧壒娆°��
         if (reqVO.getBatchId() != null) {
-            return batchService.validateBatchExists(reqVO.getBatchId(), reqVO.getItemId());
+            MesWmBatchDO existing = batchService.validateBatchExists(reqVO.getBatchId(), reqVO.getItemId());
+            if (StrUtil.isNotBlank(reqVO.getReelNo())
+                    && !Objects.equals(StrUtil.trim(reqVO.getReelNo()), StrUtil.trim(existing.getReelNo()))) {
+                throw exception(WM_BATCH_REEL_MISMATCH);
+            }
+            return existing;
         }
 
         // 1. 鏈寚瀹氳拷婧壒娆′笖鐗╂枡鏈惎鐢ㄦ壒娆$鐞嗭紝杩斿洖 null
-        if (Boolean.FALSE.equals(item.getIsBatchManaged())) {
+        if (Boolean.FALSE.equals(item.getIsBatchManaged()) && StrUtil.isBlank(reqVO.getReelNo())) {
             return null;
         }
 
@@ -471,6 +478,7 @@
         MesWmBatchGenerateReqVO batchReqVO = new MesWmBatchGenerateReqVO()
                 .setItemId(reqVO.getItemId())
                 .setBatchCode(reqVO.getBatchCode())
+                .setReelNo(StrUtil.trimToNull(reqVO.getReelNo()))
                 .setVendorId(reqVO.getVendorId())
                 .setProduceDate(reqVO.getProduceDate() != null ? reqVO.getProduceDate().atStartOfDay() : null)
                 .setExpireDate(reqVO.getExpireDate() != null ? reqVO.getExpireDate().atStartOfDay() : null)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnsales/MesWmReturnSalesLineServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnsales/MesWmReturnSalesLineServiceImpl.java
index c80507d..9381df2 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnsales/MesWmReturnSalesLineServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnsales/MesWmReturnSalesLineServiceImpl.java
@@ -113,6 +113,12 @@
                     MesWmProductSalesStatusEnum.FINISHED.getStatus()) == 0) {
                 throw exception(WM_RETURN_SALES_BATCH_NOT_SHIPPED);
             }
+            // 鎵嬪伐鍏ュ簱鎵规鍙兘娌℃湁瀹㈡埛锛涗粎鍦ㄨ鍗曠洏鍙峰強宸插畬鎴愬嚭搴撻兘宸查獙璇佸悗鍏佽閫�璐с��
+            if (batch != null && (batch.getClientId() != null || reelNumbers.isEmpty())) {
+                batchService.validateBatchExists(batch.getId(), reqVO.getItemId(), returnSales.getClientId(), null);
+            }
+        } else if (batch != null) {
+            batchService.validateBatchExists(batch.getId(), reqVO.getItemId(), returnSales.getClientId(), null);
         }
     }
 
@@ -191,8 +197,7 @@
         }
         // 鏍¢獙鎵规瀛樺湪涓斿睘浜庡綋鍓嶇墿鏂欏拰瀹㈡埛
         if (batchId != null) {
-            // 浠庣埗鍗曡幏鍙栧鎴稩D锛屾牎楠屾壒娆″綊灞�
-            return batchService.validateBatchExists(batchId, itemId, returnSales.getClientId(), null);
+            return batchService.validateBatchExists(batchId, itemId);
         }
         return null;
     }
diff --git a/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/qc/rqc/MesQcRqcServiceImplTest.java b/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/qc/rqc/MesQcRqcServiceImplTest.java
index 4cabc06..c096ad2 100644
--- a/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/qc/rqc/MesQcRqcServiceImplTest.java
+++ b/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/qc/rqc/MesQcRqcServiceImplTest.java
@@ -11,6 +11,7 @@
 import cn.iocoder.yudao.module.mes.service.wm.returnissue.MesWmReturnIssueLineService;
 import cn.iocoder.yudao.module.mes.service.wm.returnsales.MesWmReturnSalesLineService;
 import cn.iocoder.yudao.module.mes.service.qc.indicatorresult.MesQcIndicatorResultService;
+import cn.iocoder.yudao.module.mes.service.qc.ncr.MesQcNcrService;
 import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
 import jakarta.annotation.Resource;
 import org.junit.jupiter.api.Test;
@@ -59,6 +60,8 @@
     private AdminUserApi adminUserApi;
     @MockitoBean
     private MesQcIndicatorResultService indicatorResultService;
+    @MockitoBean
+    private MesQcNcrService ncrService;
 
     @Test
     public void testFinishRqc_successWithReturnIssue() {
diff --git a/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/wm/materialstock/MesWmMaterialStockReelTest.java b/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/wm/materialstock/MesWmMaterialStockReelTest.java
new file mode 100644
index 0000000..51094f2
--- /dev/null
+++ b/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/wm/materialstock/MesWmMaterialStockReelTest.java
@@ -0,0 +1,43 @@
+package cn.iocoder.yudao.module.mes.service.wm.materialstock;
+
+import cn.iocoder.yudao.module.mes.controller.admin.wm.batch.vo.MesWmBatchGenerateReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.wm.materialstock.vo.MesWmMaterialStockAdjustReqVO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.mdm.MesMdmItemDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.wm.batch.MesWmBatchDO;
+import cn.iocoder.yudao.module.mes.service.wm.batch.MesWmBatchService;
+import org.junit.jupiter.api.Test;
+import org.springframework.test.util.ReflectionTestUtils;
+
+import static org.junit.jupiter.api.Assertions.*;
+import static org.mockito.ArgumentMatchers.*;
+import static org.mockito.Mockito.*;
+
+class MesWmMaterialStockReelTest {
+    @Test
+    void manualReelCreatesTraceableBatchEvenWhenBatchManagementIsDisabled() {
+        var service = new MesWmMaterialStockServiceImpl();
+        var batches = mock(MesWmBatchService.class);
+        ReflectionTestUtils.setField(service, "batchService", batches);
+        var item = new MesMdmItemDO();
+        item.setIsBatchManaged(false);
+        var request = new MesWmMaterialStockAdjustReqVO();
+        request.setItemId(1L);
+        request.setReelNo(" PHCS ");
+        MesWmBatchDO batch = MesWmBatchDO.builder().id(2L).reelNo("PHCS").build();
+        when(batches.getOrGenerateBatchCode(any())).thenReturn(batch);
+        assertSame(batch, ReflectionTestUtils.invokeMethod(service, "resolveBatch", request, item));
+        verify(batches).getOrGenerateBatchCode(argThat((MesWmBatchGenerateReqVO v) -> "PHCS".equals(v.getReelNo())));
+    }
+
+    @Test
+    void existingBatchCannotBeRelabelled() {
+        var service = new MesWmMaterialStockServiceImpl();
+        var batches = mock(MesWmBatchService.class);
+        ReflectionTestUtils.setField(service, "batchService", batches);
+        var request = new MesWmMaterialStockAdjustReqVO();
+        request.setItemId(1L); request.setBatchId(2L); request.setReelNo("PHCS");
+        when(batches.validateBatchExists(2L, 1L)).thenReturn(MesWmBatchDO.builder().id(2L).build());
+        assertThrows(RuntimeException.class, () -> ReflectionTestUtils.invokeMethod(service, "resolveBatch", request, new MesMdmItemDO()));
+        verify(batches, never()).getOrGenerateBatchCode(any());
+    }
+}
diff --git a/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/wm/materialstock/MesWmMaterialStockSearchTest.java b/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/wm/materialstock/MesWmMaterialStockSearchTest.java
new file mode 100644
index 0000000..9a259d3
--- /dev/null
+++ b/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/wm/materialstock/MesWmMaterialStockSearchTest.java
@@ -0,0 +1,38 @@
+package cn.iocoder.yudao.module.mes.service.wm.materialstock;
+
+import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest;
+import cn.iocoder.yudao.module.mes.controller.admin.wm.materialstock.vo.MesWmMaterialStockPageReqVO;
+import cn.iocoder.yudao.module.mes.dal.mysql.wm.materialstock.MesWmMaterialStockMapper;
+import jakarta.annotation.Resource;
+import org.junit.jupiter.api.Test;
+import org.springframework.jdbc.core.JdbcTemplate;
+import javax.sql.DataSource;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+class MesWmMaterialStockSearchTest extends BaseDbUnitTest {
+    @Resource private MesWmMaterialStockMapper mapper;
+    @Resource private DataSource dataSource;
+
+    @Test void filtersItemNameCodeVendorAndMdmIdBeforePagination() {
+        JdbcTemplate jdbc = new JdbcTemplate(dataSource);
+        jdbc.execute("ALTER TABLE mes_wm_material_stock ADD COLUMN IF NOT EXISTS frozen_quantity DECIMAL(14,2)");
+        jdbc.execute("ALTER TABLE mes_wm_material_stock ADD COLUMN IF NOT EXISTS reserved_quantity DECIMAL(14,2)");
+        jdbc.execute("ALTER TABLE mes_wm_material_stock ADD COLUMN IF NOT EXISTS in_transit_quantity DECIMAL(14,2)");
+        jdbc.execute("CREATE TABLE IF NOT EXISTS mdm_item (id BIGINT PRIMARY KEY, name VARCHAR(100), code VARCHAR(100), deleted BOOLEAN)");
+        jdbc.execute("CREATE TABLE IF NOT EXISTS srm_supplier (id BIGINT PRIMARY KEY, name VARCHAR(100), deleted BOOLEAN)");
+        jdbc.update("INSERT INTO mdm_item VALUES (901, '榛戞灨鏉�', 'E2E-901', FALSE), (902, '榛勮姫', 'E2E-902', FALSE)");
+        jdbc.update("INSERT INTO srm_supplier VALUES (801, '娴嬭瘯渚涘簲鍟�', FALSE), (802, '鍏朵粬渚涘簲鍟�', FALSE)");
+        jdbc.update("INSERT INTO mes_wm_material_stock (item_id, vendor_id, quantity) VALUES (901, 801, 1), (902, 802, 1)");
+        var req = new MesWmMaterialStockPageReqVO();
+        req.setItemName("鏋告潪");
+        assertEquals(1L, mapper.selectPage(req, null, null, null).getTotal());
+        req.setItemName("E2E-901");
+        req.setVendorName("娴嬭瘯");
+        assertEquals(1L, mapper.selectPage(req, null, null, null).getTotal());
+        req.setMdmItemId(902L);
+        assertEquals(0L, mapper.selectPage(req, null, null, null).getTotal());
+        req.setItemName("涓嶅瓨鍦�");
+        req.setMdmItemId(null);
+        assertEquals(0L, mapper.selectPage(req, null, null, null).getTotal());
+    }
+}
diff --git a/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/wm/productsales/MesWmProductSalesOrderWritebackTest.java b/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/wm/productsales/MesWmProductSalesOrderWritebackTest.java
new file mode 100644
index 0000000..d27191a
--- /dev/null
+++ b/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/wm/productsales/MesWmProductSalesOrderWritebackTest.java
@@ -0,0 +1,48 @@
+package cn.iocoder.yudao.module.mes.service.wm.productsales;
+
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.module.erp.api.sale.ErpSaleOrderApi;
+import cn.iocoder.yudao.module.erp.api.sale.dto.ErpSaleOrderItemRespDTO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productsales.*;
+import cn.iocoder.yudao.module.mes.dal.mysql.wm.productsales.MesWmProductSalesMapper;
+import cn.iocoder.yudao.module.mes.enums.wm.MesWmProductSalesStatusEnum;
+import cn.iocoder.yudao.module.mes.service.wm.stockreserve.MesWmStockReserveService;
+import cn.iocoder.yudao.module.mes.service.wm.transaction.MesWmTransactionService;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import java.math.BigDecimal;
+import java.util.List;
+import static org.mockito.Mockito.*;
+
+@ExtendWith(MockitoExtension.class)
+class MesWmProductSalesOrderWritebackTest {
+    @InjectMocks private MesWmProductSalesServiceImpl service;
+    @Mock private MesWmProductSalesMapper mapper;
+    @Mock private MesWmProductSalesLineService lines;
+    @Mock private MesWmProductSalesDetailService details;
+    @Mock private MesWmStockReserveService reserves;
+    @Mock private MesWmTransactionService transactions;
+    @Mock private MesWmSalesReelGuard reelGuard;
+    @Mock private ErpSaleOrderApi orders;
+
+    @Test void completedSaleWritesQuantityToSelectedOrderItem() {
+        when(mapper.selectById(1L)).thenReturn(MesWmProductSalesDO.builder().id(1L).code("TEST")
+                .status(MesWmProductSalesStatusEnum.APPROVED.getStatus()).build());
+        var line = MesWmProductSalesLineDO.builder().id(2L).salesId(1L).saleOrderItemId(3L)
+                .quantity(BigDecimal.ONE).build();
+        when(lines.getProductSalesLineListBySalesId(1L)).thenReturn(List.of(line));
+        when(lines.getProductSalesLine(2L)).thenReturn(line);
+        when(details.getProductSalesDetailListBySalesId(1L)).thenReturn(List.of(
+                MesWmProductSalesDetailDO.builder().lineId(2L).batchId(5L).quantity(BigDecimal.ONE).build()));
+        var item = new ErpSaleOrderItemRespDTO();
+        item.setOrderId(4L);
+        when(orders.getSaleOrderItem(3L)).thenReturn(CommonResult.success(item));
+        service.finishProductSales(1L);
+        verify(orders).updateOrderItemOutCount(3L, BigDecimal.ONE);
+        verify(orders).updateOrderOutStatus(4L);
+        verify(reelGuard).validate(line, 5L);
+    }
+}
diff --git a/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/wm/productsales/SalesBatchQueryParserTest.java b/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/wm/productsales/SalesBatchQueryParserTest.java
new file mode 100644
index 0000000..2cd36b0
--- /dev/null
+++ b/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/wm/productsales/SalesBatchQueryParserTest.java
@@ -0,0 +1,17 @@
+package cn.iocoder.yudao.module.mes.service.wm.productsales;
+
+import cn.iocoder.yudao.module.mes.dal.mysql.wm.productsales.MesWmProductSalesDetailMapper;
+import net.sf.jsqlparser.parser.CCJSqlParserUtil;
+import org.apache.ibatis.annotations.Select;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+
+class SalesBatchQueryParserTest {
+    @Test void shipmentBatchQueryCanBeParsedByMybatisInterceptor() throws Exception {
+        String sql = String.join("", MesWmProductSalesDetailMapper.class
+                .getMethod("countFinishedSaleBatch", Long.class, Long.class, Long.class, Integer.class)
+                .getAnnotation(Select.class).value()).replaceAll("#\\{[^}]+}", "?");
+        assertDoesNotThrow(() -> CCJSqlParserUtil.parse(sql));
+    }
+}
diff --git a/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/wm/returnsales/MesWmReturnSalesLineServiceImplTest.java b/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/wm/returnsales/MesWmReturnSalesLineServiceImplTest.java
index 6858273..7acefec 100644
--- a/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/wm/returnsales/MesWmReturnSalesLineServiceImplTest.java
+++ b/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/wm/returnsales/MesWmReturnSalesLineServiceImplTest.java
@@ -12,6 +12,9 @@
 
 import cn.iocoder.yudao.module.mes.service.md.item.MesMdItemService;
 import cn.iocoder.yudao.module.mes.service.wm.batch.MesWmBatchService;
+import cn.iocoder.yudao.module.mes.service.mdm.MesMdmItemService;
+import cn.iocoder.yudao.module.erp.api.sale.ErpSaleOrderApi;
+import cn.iocoder.yudao.module.mes.dal.mysql.wm.productsales.MesWmProductSalesDetailMapper;
 
 import java.math.BigDecimal;
 import java.util.List;
@@ -45,6 +48,12 @@
 
     @MockitoBean
     private MesWmReturnSalesDetailService returnSalesDetailService;
+    @MockitoBean
+    private MesMdmItemService mdmItemService;
+    @MockitoBean
+    private ErpSaleOrderApi saleOrderApi;
+    @MockitoBean
+    private MesWmProductSalesDetailMapper productSalesDetailMapper;
 
     @Test
     public void testUpdateReturnSalesLineWhenRqcFinish_allPass() {
diff --git a/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/wm/returnsales/ReturnSalesManualBatchReelTest.java b/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/wm/returnsales/ReturnSalesManualBatchReelTest.java
new file mode 100644
index 0000000..179976d
--- /dev/null
+++ b/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/wm/returnsales/ReturnSalesManualBatchReelTest.java
@@ -0,0 +1,48 @@
+package cn.iocoder.yudao.module.mes.service.wm.returnsales;
+
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.module.erp.api.sale.ErpSaleOrderApi;
+import cn.iocoder.yudao.module.erp.api.sale.dto.ErpSaleOrderItemRespDTO;
+import cn.iocoder.yudao.module.mes.controller.admin.wm.returnsales.vo.line.MesWmReturnSalesLineSaveReqVO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.mdm.MesMdmItemDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.wm.batch.MesWmBatchDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.wm.returnsales.MesWmReturnSalesDO;
+import cn.iocoder.yudao.module.mes.dal.mysql.wm.productsales.MesWmProductSalesDetailMapper;
+import cn.iocoder.yudao.module.mes.service.mdm.MesMdmItemService;
+import cn.iocoder.yudao.module.mes.service.wm.batch.MesWmBatchService;
+import org.junit.jupiter.api.Test;
+import org.springframework.test.util.ReflectionTestUtils;
+
+import java.util.List;
+import static org.junit.jupiter.api.Assertions.*;
+import static org.mockito.Mockito.*;
+
+class ReturnSalesManualBatchReelTest {
+    @Test void manualBatchRequiresMatchingReelAndCompletedShipment() {
+        var service = new MesWmReturnSalesLineServiceImpl();
+        var returns = mock(MesWmReturnSalesService.class);
+        var items = mock(MesMdmItemService.class);
+        var batches = mock(MesWmBatchService.class);
+        var orders = mock(ErpSaleOrderApi.class);
+        var shipments = mock(MesWmProductSalesDetailMapper.class);
+        ReflectionTestUtils.setField(service, "returnSalesService", returns);
+        ReflectionTestUtils.setField(service, "mdmItemService", items);
+        ReflectionTestUtils.setField(service, "batchService", batches);
+        ReflectionTestUtils.setField(service, "saleOrderApi", orders);
+        ReflectionTestUtils.setField(service, "productSalesDetailMapper", shipments);
+        var order = new MesWmReturnSalesDO().setSaleOrderId(5L).setClientId(9L).setSalesOrderCode("SO");
+        when(returns.validateReturnSalesExistsAndPrepare(1L)).thenReturn(order);
+        when(items.validateItemExistsAndEnable(2L)).thenReturn(new MesMdmItemDO());
+        var batch = MesWmBatchDO.builder().id(3L).itemId(2L).code("B").reelNo("PHCS").build();
+        when(batches.validateBatchExists(3L, 2L)).thenReturn(batch);
+        var item = new ErpSaleOrderItemRespDTO().setProductId(2L).setReelNo("PHCS");
+        when(orders.getSaleOrderItemList(5L)).thenReturn(CommonResult.success(List.of(item)));
+        var req = new MesWmReturnSalesLineSaveReqVO().setReturnId(1L).setItemId(2L).setBatchId(3L);
+        assertThrows(RuntimeException.class, () -> ReflectionTestUtils.invokeMethod(service, "validateLineSaveData", req));
+        when(shipments.countFinishedSaleBatch(eq(5L), eq(2L), eq(3L), anyInt())).thenReturn(1L);
+        assertDoesNotThrow(() -> ReflectionTestUtils.invokeMethod(service, "validateLineSaveData", req));
+        assertEquals("B", req.getBatchCode());
+        batch.setReelNo("OTHER");
+        assertThrows(RuntimeException.class, () -> ReflectionTestUtils.invokeMethod(service, "validateLineSaveData", req));
+    }
+}

--
Gitblit v1.9.3