From 6b8585fc452ecdcaa82d86fab79a9f27bb442851 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期四, 05 十一月 2026 09:13:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_南通_苏珩' into dev_南通_苏珩
---
yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/qc/oqc/MesQcOqcAutoCreateTest.java | 7 -------
1 files changed, 0 insertions(+), 7 deletions(-)
diff --git a/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/qc/oqc/MesQcOqcAutoCreateTest.java b/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/qc/oqc/MesQcOqcAutoCreateTest.java
index 1a1c3d8..afb8ace 100644
--- a/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/qc/oqc/MesQcOqcAutoCreateTest.java
+++ b/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/qc/oqc/MesQcOqcAutoCreateTest.java
@@ -4,11 +4,9 @@
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.dal.dataobject.qc.template.MesQcTemplateItemDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productsales.MesWmProductSalesDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productsales.MesWmProductSalesLineDO;
import cn.iocoder.yudao.module.mes.dal.mysql.qc.oqc.MesQcOqcMapper;
-import cn.iocoder.yudao.module.mes.service.qc.template.MesQcTemplateItemService;
import cn.iocoder.yudao.module.mes.service.wm.productsales.MesWmProductSalesService;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
@@ -28,7 +26,6 @@
class MesQcOqcAutoCreateTest {
@InjectMocks private MesQcOqcServiceImpl service;
@Mock private MesQcOqcMapper mapper;
- @Mock private MesQcTemplateItemService templates;
@Mock private MesQcOqcLineService lines;
@Mock private MesWmProductSalesService sales;
@Mock private ErpSaleOrderApi saleOrderApi;
@@ -36,8 +33,6 @@
@Test
void generatedInspectionUsesHistoricalShipmentDateAndPreservesPendingQuantities() {
LocalDateTime date = LocalDateTime.of(2026, 9, 23, 15, 30);
- when(templates.getRequiredTemplateByItemIdAndType(10L, 3))
- .thenReturn(new MesQcTemplateItemDO().setTemplateId(20L));
when(sales.getProductSales(30L)).thenReturn(new MesWmProductSalesDO().setSalesDate(date));
MesWmProductSalesLineDO line = new MesWmProductSalesLineDO().setId(40L)
.setItemId(10L).setSaleOrderItemId(60L).setQuantity(BigDecimal.valueOf(200)).setBatchCode("B001");
@@ -60,8 +55,6 @@
@Test
void historicalShipmentWithoutSaleItemDoesNotGuessReel() {
- when(templates.getRequiredTemplateByItemIdAndType(10L, 3))
- .thenReturn(new MesQcTemplateItemDO().setTemplateId(20L));
MesWmProductSalesLineDO line = new MesWmProductSalesLineDO().setId(40L)
.setItemId(10L).setQuantity(BigDecimal.ONE);
--
Gitblit v1.9.3