From 0fdd0bf60b7d98d21c9b5ff95bb55f0fa6495007 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期五, 14 八月 2026 14:20:03 +0800
Subject: [PATCH] Merge branch 'dev_business' of http://114.132.189.42:9002/r/mom-pro2-after into dev_business
---
yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/pro/feedback/MesProFeedbackServiceImplTest.java | 35 +++++++++++++++++++++++------------
1 files changed, 23 insertions(+), 12 deletions(-)
diff --git a/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/pro/feedback/MesProFeedbackServiceImplTest.java b/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/pro/feedback/MesProFeedbackServiceImplTest.java
index c7e74c5..4cefcbd 100644
--- a/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/pro/feedback/MesProFeedbackServiceImplTest.java
+++ b/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/pro/feedback/MesProFeedbackServiceImplTest.java
@@ -2,6 +2,7 @@
import cn.hutool.core.collection.ListUtil;
import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest;
+import cn.iocoder.yudao.module.mes.controller.admin.pro.feedback.vo.MesProFeedbackApproveReqVO;
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.feedback.MesProFeedbackDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.route.MesProRouteProcessDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productproduce.MesWmProductProduceDO;
@@ -31,7 +32,7 @@
/**
* {@link MesProFeedbackServiceImpl} 鐨勫崟鍏冩祴璇�
*
- * @author 鑺嬮亾婧愮爜
+ * @author 瓒呯骇绠＄悊鍛�
*/
@Import(MesProFeedbackServiceImpl.class)
public class MesProFeedbackServiceImplTest extends BaseDbUnitTest {
@@ -222,7 +223,7 @@
// mock: 浜у搧浜у嚭鍗�
MesWmProductProduceDO produce = randomPojo(MesWmProductProduceDO.class);
- when(productProduceService.generateProductProduce(any(), eq(false))).thenReturn(produce);
+ when(productProduceService.generateProductProduce(any(), eq(false), any())).thenReturn(produce);
// mock: 浜у嚭琛岋紙鐢ㄤ簬 updateTaskAndWorkOrderByFeedback锛�
MesWmProductProduceLineDO qualifiedLine = MesWmProductProduceLineDO.builder()
@@ -232,7 +233,9 @@
.thenReturn(ListUtil.of(qualifiedLine));
// 璋冪敤
- boolean result = feedbackService.approveFeedback(feedback.getId());
+ MesProFeedbackApproveReqVO reqVO = new MesProFeedbackApproveReqVO();
+ reqVO.setId(feedback.getId());
+ boolean result = feedbackService.approveFeedback(reqVO);
// 鏂█ 1锛氳繑鍥� true锛堝凡瀹屾垚锛�
assertTrue(result);
@@ -243,7 +246,7 @@
assertEquals(0, BigDecimal.ZERO.compareTo(updated.getUncheckQuantity()));
// 鏂█ 3锛氳皟鐢ㄤ簡浜у嚭鍗曠敓鎴� + 鍏ュ簱 + 浠诲姟/宸ュ崟鏇存柊
- verify(productProduceService).generateProductProduce(any(), eq(false));
+ verify(productProduceService).generateProductProduce(any(), eq(false), any());
verify(productProduceService).finishProductProduce(produce.getId());
verify(taskService).updateProducedQuantity(eq(feedback.getTaskId()),
any(BigDecimal.class), any(BigDecimal.class), any(BigDecimal.class));
@@ -273,7 +276,9 @@
.thenReturn(routeProcess);
// 璋冪敤
- boolean result = feedbackService.approveFeedback(feedback.getId());
+ MesProFeedbackApproveReqVO reqVO = new MesProFeedbackApproveReqVO();
+ reqVO.setId(feedback.getId());
+ boolean result = feedbackService.approveFeedback(reqVO);
// 鏂█ 1锛氳繑鍥� false锛堝緟妫�楠岋級
assertFalse(result);
@@ -283,7 +288,7 @@
assertEquals(MesProFeedbackStatusEnum.UNCHECK.getStatus(), updated.getStatus());
// 鏂█ 3锛氱敓鎴愪簡寰呮浜у嚭鍗曪紝浣嗘病鏈� finishProductProduce
- verify(productProduceService).generateProductProduce(any(), eq(true));
+ verify(productProduceService).generateProductProduce(any(), eq(true), any());
verify(productProduceService, never()).finishProductProduce(anyLong());
// 鏂█ 4锛氭病鏈夋洿鏂颁换鍔�/宸ュ崟鏁伴噺锛堢瓑 IPQC 鍥炶皟锛�
@@ -313,7 +318,9 @@
.thenReturn(routeProcess);
// 璋冪敤
- boolean result = feedbackService.approveFeedback(feedback.getId());
+ MesProFeedbackApproveReqVO reqVO = new MesProFeedbackApproveReqVO();
+ reqVO.setId(feedback.getId());
+ boolean result = feedbackService.approveFeedback(reqVO);
// 鏂█ 1锛氳繑鍥� true锛堝凡瀹屾垚锛�
assertTrue(result);
@@ -323,7 +330,7 @@
assertEquals(MesProFeedbackStatusEnum.FINISHED.getStatus(), updated.getStatus());
// 鏂█ 3锛氫笉鐢熸垚浜у嚭鍗曪紝涓嶆洿鏂颁换鍔�/宸ュ崟
- verify(productProduceService, never()).generateProductProduce(any(), anyBoolean());
+ verify(productProduceService, never()).generateProductProduce(any(), anyBoolean(), any());
verify(taskService, never()).updateProducedQuantity(anyLong(), any(), any(), any());
}
@@ -349,11 +356,13 @@
.thenReturn(routeProcess);
// 璋冪敤锛屽簲璇ユ姏寮傚父
+ MesProFeedbackApproveReqVO reqVO = new MesProFeedbackApproveReqVO();
+ reqVO.setId(feedback.getId());
assertThrows(Exception.class, () ->
- feedbackService.approveFeedback(feedback.getId()));
+ feedbackService.approveFeedback(reqVO));
// 鏂█锛氫笉搴旇鎵ц浠讳綍鍚庣画鎿嶄綔
- verify(productProduceService, never()).generateProductProduce(any(), anyBoolean());
+ verify(productProduceService, never()).generateProductProduce(any(), anyBoolean(), any());
verify(itemConsumeService, never()).generateItemConsume(any());
}
@@ -380,7 +389,9 @@
.thenReturn(routeProcess);
// 璋冪敤
- boolean result = feedbackService.approveFeedback(feedback.getId());
+ MesProFeedbackApproveReqVO reqVO = new MesProFeedbackApproveReqVO();
+ reqVO.setId(feedback.getId());
+ boolean result = feedbackService.approveFeedback(reqVO);
// 鏂█ 1锛氳繑鍥� true锛堢洿鎺ュ畬鎴愶紝涓嶈蛋 UNCHECK锛�
assertTrue(result);
@@ -391,7 +402,7 @@
assertEquals(0, BigDecimal.ZERO.compareTo(updated.getUncheckQuantity()));
// 鏂█ 3锛氶潪鍏抽敭宸ュ簭涓嶇敓鎴愪骇鍑哄崟
- verify(productProduceService, never()).generateProductProduce(any(), anyBoolean());
+ verify(productProduceService, never()).generateProductProduce(any(), anyBoolean(), any());
}
}
--
Gitblit v1.9.3