From d39e4f7d839167c16425086dfa2f8747bccfdff9 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期四, 05 十一月 2026 17:39:01 +0800
Subject: [PATCH] feat: 打通销售采购财务闭环并完成累计业务优化

---
 yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/wm/productsales/MesWmProductSalesLineReelTest.java |   50 ++++++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 46 insertions(+), 4 deletions(-)

diff --git a/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/wm/productsales/MesWmProductSalesLineReelTest.java b/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/wm/productsales/MesWmProductSalesLineReelTest.java
index 0601d87..5d4a225 100644
--- a/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/wm/productsales/MesWmProductSalesLineReelTest.java
+++ b/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/wm/productsales/MesWmProductSalesLineReelTest.java
@@ -7,6 +7,9 @@
 import cn.iocoder.yudao.module.mes.dal.mysql.wm.productsales.MesWmProductSalesLineMapper;
 import cn.iocoder.yudao.module.mes.service.mdm.MesMdmItemService;
 import cn.iocoder.yudao.module.mes.service.qc.oqc.MesQcOqcService;
+import cn.iocoder.yudao.module.erp.api.sale.ErpSaleOrderApi;
+import cn.iocoder.yudao.module.erp.api.sale.dto.ErpSaleOrderItemRespDTO;
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.module.mes.service.wm.salesnotice.MesWmSalesNoticeLineService;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -18,6 +21,7 @@
 import java.math.BigDecimal;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.*;
 
@@ -29,6 +33,44 @@
     @Mock private MesWmSalesNoticeLineService noticeService;
     @Mock private MesMdmItemService itemService;
     @Mock private MesQcOqcService oqcService;
+    @Mock private ErpSaleOrderApi saleOrderApi;
+
+    @Test
+    void directSaleRetainsSelectedOrderItem() {
+        var req = new MesWmProductSalesLineSaveReqVO();
+        req.setSalesId(1L);
+        req.setSaleOrderItemId(5L);
+        req.setItemId(3L);
+        req.setQuantity(BigDecimal.ONE);
+        when(salesService.validateProductSalesExistsAndDraft(1L))
+                .thenReturn(MesWmProductSalesDO.builder().id(1L).saleOrderId(4L).build());
+        var item = new ErpSaleOrderItemRespDTO();
+        item.setId(5L);
+        item.setOrderId(4L);
+        item.setProductId(3L);
+        when(saleOrderApi.getSaleOrderItem(5L)).thenReturn(CommonResult.success(item));
+        service.createProductSalesLine(req);
+        var line = ArgumentCaptor.forClass(MesWmProductSalesLineDO.class);
+        verify(mapper).insert(line.capture());
+        assertEquals(5L, line.getValue().getSaleOrderItemId());
+    }
+
+    @Test
+    void directSaleRejectsItemFromAnotherOrder() {
+        var req = new MesWmProductSalesLineSaveReqVO();
+        req.setSalesId(1L);
+        req.setSaleOrderItemId(5L);
+        req.setItemId(3L);
+        req.setQuantity(BigDecimal.ONE);
+        when(salesService.validateProductSalesExistsAndDraft(1L))
+                .thenReturn(MesWmProductSalesDO.builder().id(1L).saleOrderId(4L).build());
+        var item = new ErpSaleOrderItemRespDTO();
+        item.setOrderId(99L);
+        item.setProductId(3L);
+        when(saleOrderApi.getSaleOrderItem(5L)).thenReturn(CommonResult.success(item));
+        assertThrows(RuntimeException.class, () -> service.createProductSalesLine(req));
+        verify(mapper, never()).insert(any(MesWmProductSalesLineDO.class));
+    }
 
     private MesWmProductSalesLineSaveReqVO request() {
         var req = new MesWmProductSalesLineSaveReqVO();
@@ -53,17 +95,17 @@
     }
 
     @Test
-    void enablingInspectionRetainsSalesItemForOqc() {
+    void enablingInspectionKeepsSalesItemAndDefersOqcToLink() {
         var req = request();
         req.setId(6L);
         req.setOqcCheckFlag(true);
         when(mapper.selectById(6L)).thenReturn(MesWmProductSalesLineDO.builder()
                 .id(6L).salesId(1L).oqcCheckFlag(false).build());
-        when(salesService.getProductSales(1L)).thenReturn(MesWmProductSalesDO.builder().id(1L).build());
-        when(oqcService.createOqcFromProductSales(eq(1L), any(), any(), any())).thenReturn(7L);
         service.updateProductSalesLine(req);
         var line = ArgumentCaptor.forClass(MesWmProductSalesLineDO.class);
-        verify(oqcService).createOqcFromProductSales(eq(1L), line.capture(), any(), any());
+        verify(mapper).updateById(line.capture());
         assertEquals(5L, line.getValue().getSaleOrderItemId());
+        // 妫�楠屽崟鐢辫川妫�浜哄憳褰曞叆鍚庨�氳繃鐩樺彿鍏宠仈锛岃淇濆瓨鏃朵笉鍐嶈嚜鍔ㄥ垱寤� OQC銆�
+        verifyNoInteractions(oqcService);
     }
 }

--
Gitblit v1.9.3