♻️ refactor(mes): 使用 ListUtil 替换 List.of

YunaiV
1 parent 936783f9
Showing 22 changed files with 67 additions and 47 deletions
yudao-framework/yudao-spring-boot-starter-excel/src/test/java/cn/iocoder/yudao/framework/dict/core/util/DictFrameworkUtilsTest.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/andon/MesProAndonConfigController.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/andon/MesProAndonRecordController.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/card/MesProCardController.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/card/MesProCardProcessController.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/feedback/MesProFeedbackController.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/route/MesProRouteProcessController.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/route/MesProRouteProductBomController.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/route/MesProRouteProductController.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/task/MesProTaskController.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/task/MesProTaskIssueController.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/MesProWorkOrderBomController.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/MesProWorkOrderController.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/tm/tool/MesTmToolServiceImpl.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/outsourceissue/MesWmOutsourceIssueServiceImpl.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/outsourcereceipt/MesWmOutsourceReceiptServiceImpl.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnissue/MesWmReturnIssueServiceImpl.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnsales/MesWmReturnSalesServiceImpl.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/transfer/MesWmTransferServiceImpl.java
yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/pro/feedback/MesProFeedbackServiceImplTest.java
 package cn.iocoder.yudao.framework.dict.core.util;
+import cn.hutool.core.collection.ListUtil;
 import cn.iocoder.yudao.framework.common.biz.system.dict.DictDataCommonApi;
 import cn.iocoder.yudao.framework.common.biz.system.dict.dto.DictDataRespDTO;
 import cn.iocoder.yudao.framework.dict.core.DictFrameworkUtils;
@@ -32,7 +33,7 @@ public class DictFrameworkUtilsTest extends BaseMockitoUnitTest {
     @Test
     public void testParseDictDataLabel() {
         // mock 数据
-        List<DictDataRespDTO> dictDatas = List.of(
+        List<DictDataRespDTO> dictDatas = ListUtil.of(
                 randomPojo(DictDataRespDTO.class, o -> o.setDictType("animal").setValue("cat").setLabel("猫")),
                 randomPojo(DictDataRespDTO.class, o -> o.setDictType("animal").setValue("dog").setLabel("狗"))
         );
@@ -46,7 +47,7 @@ public class DictFrameworkUtilsTest extends BaseMockitoUnitTest {
     @Test
     public void testParseDictDataValue() {
         // mock 数据
-        List<DictDataRespDTO> dictDatas = List.of(
+        List<DictDataRespDTO> dictDatas = ListUtil.of(
                 randomPojo(DictDataRespDTO.class, o -> o.setDictType("animal").setValue("cat").setLabel("猫")),
                 randomPojo(DictDataRespDTO.class, o -> o.setDictType("animal").setValue("dog").setLabel("狗"))
         );
 package cn.iocoder.yudao.module.mes.controller.admin.pro.andon;
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.collection.ListUtil;
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.collection.MapUtils;
@@ -73,7 +74,7 @@ public class MesProAndonConfigController {
         if (config == null) {
             return success(null);
         }
-        return success(buildConfigRespVOList(List.of(config)).get(0));
+        return success(buildConfigRespVOList(ListUtil.of(config)).get(0));
     }
     @GetMapping("/page")
 package cn.iocoder.yudao.module.mes.controller.admin.pro.andon;
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.collection.ListUtil;
 import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.framework.common.pojo.PageParam;
@@ -95,7 +96,7 @@ public class MesProAndonRecordController {
         if (record == null) {
             return success(null);
         }
-        return success(buildRecordRespVOList(List.of(record)).get(0));
+        return success(buildRecordRespVOList(ListUtil.of(record)).get(0));
     }
     @GetMapping("/page")
 package cn.iocoder.yudao.module.mes.controller.admin.pro.card;
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.collection.ListUtil;
 import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.framework.common.pojo.PageParam;
@@ -116,7 +117,7 @@ public class MesProCardController {
         if (card == null) {
             return success(null);
         }
-        return success(buildCardRespVOList(List.of(card)).get(0));
+        return success(buildCardRespVOList(ListUtil.of(card)).get(0));
     }
     @GetMapping("/page")
 package cn.iocoder.yudao.module.mes.controller.admin.pro.card;
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.collection.ListUtil;
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
@@ -82,7 +83,7 @@ public class MesProCardProcessController {
         if (cardProcess == null) {
             return success(null);
         }
-        return success(buildCardProcessRespVOList(List.of(cardProcess)).get(0));
+        return success(buildCardProcessRespVOList(ListUtil.of(cardProcess)).get(0));
     }
     @GetMapping("/page")
 package cn.iocoder.yudao.module.mes.controller.admin.pro.feedback;
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.collection.ListUtil;
 import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.framework.common.pojo.PageParam;
@@ -111,7 +112,7 @@ public class MesProFeedbackController {
         if (feedback == null) {
             return success(null);
         }
-        return success(buildFeedbackRespVOList(List.of(feedback)).get(0));
+        return success(buildFeedbackRespVOList(ListUtil.of(feedback)).get(0));
     }
     @GetMapping("/page")
 package cn.iocoder.yudao.module.mes.controller.admin.pro.route;
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.collection.ListUtil;
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.framework.common.util.collection.MapUtils;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
@@ -129,7 +130,7 @@ public class MesProRouteProcessController {
         if (routeProcess == null) {
             return null;
         }
-        return buildRouteProcessRespVOList(List.of(routeProcess)).get(0);
+        return buildRouteProcessRespVOList(ListUtil.of(routeProcess)).get(0);
     }
 }
 package cn.iocoder.yudao.module.mes.controller.admin.pro.route;
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.collection.ListUtil;
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.framework.common.util.collection.MapUtils;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
@@ -120,7 +121,7 @@ public class MesProRouteProductBomController {
         if (routeProductBom == null) {
             return null;
         }
-        return buildRouteProductBomRespVOList(List.of(routeProductBom)).get(0);
+        return buildRouteProductBomRespVOList(ListUtil.of(routeProductBom)).get(0);
     }
 }
 package cn.iocoder.yudao.module.mes.controller.admin.pro.route;
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.collection.ListUtil;
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.framework.common.util.collection.MapUtils;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
@@ -112,7 +113,7 @@ public class MesProRouteProductController {
         if (routeProduct == null) {
             return null;
         }
-        return buildRouteProductRespVOList(List.of(routeProduct)).get(0);
+        return buildRouteProductRespVOList(ListUtil.of(routeProduct)).get(0);
     }
 }
 package cn.iocoder.yudao.module.mes.controller.admin.pro.task;
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.collection.ListUtil;
 import cn.hutool.core.util.ObjUtil;
 import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
@@ -110,7 +111,7 @@ public class MesProTaskController {
         if (task == null) {
             return success(null);
         }
-        return success(buildTaskRespVOList(List.of(task)).get(0));
+        return success(buildTaskRespVOList(ListUtil.of(task)).get(0));
     }
     @GetMapping("/page")
 package cn.iocoder.yudao.module.mes.controller.admin.pro.task;
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.collection.ListUtil;
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
@@ -79,7 +80,7 @@ public class MesProTaskIssueController {
         if (taskIssue == null) {
             return success(null);
         }
-        return success(buildIssueRespVOList(List.of(taskIssue)).get(0));
+        return success(buildIssueRespVOList(ListUtil.of(taskIssue)).get(0));
     }
     @GetMapping("/page")
 package cn.iocoder.yudao.module.mes.controller.admin.pro.workorder;
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.collection.ListUtil;
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.collection.MapUtils;
@@ -88,7 +89,7 @@ public class MesProWorkOrderBomController {
         if (workOrderBom == null) {
             return success(null);
         }
-        return success(buildWorkOrderBomRespVOList(List.of(workOrderBom)).get(0));
+        return success(buildWorkOrderBomRespVOList(ListUtil.of(workOrderBom)).get(0));
     }
     @GetMapping("/page")
 package cn.iocoder.yudao.module.mes.controller.admin.pro.workorder;
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.collection.ListUtil;
 import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.framework.common.pojo.PageParam;
@@ -92,7 +93,7 @@ public class MesProWorkOrderController {
         if (workOrder == null) {
             return success(null);
         }
-        return success(buildWorkOrderRespVOList(List.of(workOrder)).get(0));
+        return success(buildWorkOrderRespVOList(ListUtil.of(workOrder)).get(0));
     }
     @GetMapping("/page")
 package cn.iocoder.yudao.module.mes.service.tm.tool;
+import cn.hutool.core.collection.ListUtil;
 import cn.hutool.core.util.ObjUtil;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
@@ -127,7 +128,7 @@ public class MesTmToolServiceImpl implements MesTmToolService {
     @Override
     public List<MesTmToolDO> getToolList(Collection<Long> ids) {
         if (ids == null || ids.isEmpty()) {
-            return List.of();
+            return ListUtil.of();
         }
         return toolMapper.selectBatchIds(ids);
     }
 package cn.iocoder.yudao.module.mes.service.wm.outsourceissue;
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.collection.ListUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.core.util.ObjUtil;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
@@ -146,7 +147,7 @@ public class MesWmOutsourceIssueServiceImpl implements MesWmOutsourceIssueServic
                     allDetails, MesWmOutsourceIssueDetailDO::getLineId);
             // 检查每行的明细数量
             for (MesWmOutsourceIssueLineDO line : lines) {
-                List<MesWmOutsourceIssueDetailDO> details = detailMap.getOrDefault(line.getId(), List.of());
+                List<MesWmOutsourceIssueDetailDO> details = detailMap.getOrDefault(line.getId(), ListUtil.of());
                 BigDecimal totalDetailQuantity = CollectionUtils.getSumValue(details,
                         MesWmOutsourceIssueDetailDO::getQuantity, BigDecimal::add, BigDecimal.ZERO);
                 // 对比行数量与明细总数量，不满足直接抛出
@@ -219,7 +220,7 @@ public class MesWmOutsourceIssueServiceImpl implements MesWmOutsourceIssueServic
                 allDetails, MesWmOutsourceIssueDetailDO::getLineId);
         // 检查每行的明细数量
         for (MesWmOutsourceIssueLineDO line : lines) {
-            List<MesWmOutsourceIssueDetailDO> details = detailMap.getOrDefault(line.getId(), List.of());
+            List<MesWmOutsourceIssueDetailDO> details = detailMap.getOrDefault(line.getId(), ListUtil.of());
             BigDecimal totalDetailQuantity = CollectionUtils.getSumValue(details,
                     MesWmOutsourceIssueDetailDO::getQuantity, BigDecimal::add, BigDecimal.ZERO);
             // 对比行数量与明细总数量
 package cn.iocoder.yudao.module.mes.service.wm.outsourcereceipt;
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.collection.ListUtil;
 import cn.hutool.core.util.ObjUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
@@ -165,7 +166,7 @@ public class MesWmOutsourceReceiptServiceImpl implements MesWmOutsourceReceiptSe
                     allDetails, MesWmOutsourceReceiptDetailDO::getLineId);
             // 检查每行的明细数量
             for (MesWmOutsourceReceiptLineDO line : lines) {
-                List<MesWmOutsourceReceiptDetailDO> details = detailMap.getOrDefault(line.getId(), List.of());
+                List<MesWmOutsourceReceiptDetailDO> details = detailMap.getOrDefault(line.getId(), ListUtil.of());
                 BigDecimal totalDetailQuantity = CollectionUtils.getSumValue(details,
                         MesWmOutsourceReceiptDetailDO::getQuantity, BigDecimal::add, BigDecimal.ZERO);
                 // 对比行数量与明细总数量，不满足直接抛出
 package cn.iocoder.yudao.module.mes.service.wm.returnissue;
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.collection.ListUtil;
 import cn.hutool.core.util.ObjUtil;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
@@ -161,7 +162,7 @@ public class MesWmReturnIssueServiceImpl implements MesWmReturnIssueService {
                     allDetails, MesWmReturnIssueDetailDO::getLineId);
             // 检查每行的明细数量
             for (MesWmReturnIssueLineDO line : lines) {
-                List<MesWmReturnIssueDetailDO> details = detailMap.getOrDefault(line.getId(), List.of());
+                List<MesWmReturnIssueDetailDO> details = detailMap.getOrDefault(line.getId(), ListUtil.of());
                 BigDecimal totalDetailQuantity = CollectionUtils.getSumValue(details,
                         MesWmReturnIssueDetailDO::getQuantity, BigDecimal::add, BigDecimal.ZERO);
                 // 对比行数量与明细总数量，不满足直接抛出
 package cn.iocoder.yudao.module.mes.service.wm.returnsales;
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.collection.ListUtil;
 import cn.hutool.core.util.ObjUtil;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
@@ -163,7 +164,7 @@ public class MesWmReturnSalesServiceImpl implements MesWmReturnSalesService {
                     allDetails, MesWmReturnSalesDetailDO::getLineId);
             // 检查每行的明细数量
             for (MesWmReturnSalesLineDO line : lines) {
-                List<MesWmReturnSalesDetailDO> details = detailMap.getOrDefault(line.getId(), List.of());
+                List<MesWmReturnSalesDetailDO> details = detailMap.getOrDefault(line.getId(), ListUtil.of());
                 BigDecimal totalDetailQuantity = CollectionUtils.getSumValue(details,
                         MesWmReturnSalesDetailDO::getQuantity, BigDecimal::add, BigDecimal.ZERO);
                 // 对比行数量与明细总数量，不满足直接抛出
 package cn.iocoder.yudao.module.mes.service.wm.transfer;
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.collection.ListUtil;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
@@ -186,7 +187,7 @@ public class MesWmTransferServiceImpl implements MesWmTransferService {
                 allDetails, MesWmTransferDetailDO::getLineId);
         // 2. 遍历行和对应的明细，创建事务
         for (MesWmTransferLineDO line : lines) {
-            List<MesWmTransferDetailDO> details = detailMap.getOrDefault(line.getId(), List.of());
+            List<MesWmTransferDetailDO> details = detailMap.getOrDefault(line.getId(), ListUtil.of());
             for (MesWmTransferDetailDO detail : details) {
                 // 2.1 先执行出库：调拨移出（从源仓库扣减库存），出库数量基于当前明细的数量
                 Long outTransactionId = wmTransactionService.createTransaction(new MesWmTransactionSaveReqDTO()
 package cn.iocoder.yudao.module.mes.service.pro.feedback;
+import cn.hutool.core.collection.ListUtil;
 import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest;
 import cn.iocoder.yudao.module.mes.dal.dataobject.pro.feedback.MesProFeedbackDO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productproduce.MesWmProductProduceLineDO;
@@ -19,11 +20,11 @@ import org.springframework.context.annotation.Import;
 import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import java.math.BigDecimal;
-import java.util.List;
 import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomLongId;
 import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomPojo;
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.mockito.Mockito.*;
 /**
@@ -78,7 +79,7 @@ public class MesProFeedbackServiceImplTest extends BaseDbUnitTest {
                 .qualityStatus(MesWmQualityStatusEnum.FAIL.getStatus())
                 .build();
         when(produceLineService.getProductProduceLineListByFeedbackId(feedback.getId()))
-                .thenReturn(List.of(qualifiedLine, unqualifiedLine));
+                .thenReturn(ListUtil.of(qualifiedLine, unqualifiedLine));
         // 调用
         BigDecimal qualifiedQty = BigDecimal.valueOf(80);
@@ -133,7 +134,7 @@ public class MesProFeedbackServiceImplTest extends BaseDbUnitTest {
                 .qualityStatus(MesWmQualityStatusEnum.PASS.getStatus())
                 .build();
         when(produceLineService.getProductProduceLineListByFeedbackId(feedback.getId()))
-                .thenReturn(List.of(qualifiedLine));
+                .thenReturn(ListUtil.of(qualifiedLine));
         // 调用
         feedbackService.updateProFeedbackWhenIpqcFinish(feedback.getId(),
 package cn.iocoder.yudao.module.mes.service.wm.itemconsume;
+import cn.hutool.core.collection.ListUtil;
 import cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil;
 import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest;
 import cn.iocoder.yudao.module.mes.controller.admin.wm.materialstock.vo.MesWmMaterialStockListReqVO;
@@ -43,9 +44,7 @@ import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomLongId
 import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.PRO_FEEDBACK_ROUTE_PROCESS_INVALID;
 import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.PRO_ROUTE_NOT_EXISTS;
 import static org.junit.jupiter.api.Assertions.*;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyLong;
-import static org.mockito.ArgumentMatchers.argThat;
+import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.*;
 /**
@@ -181,7 +180,7 @@ public class MesWmItemConsumeServiceImplTest extends BaseDbUnitTest {
         bom.setItemId(bomItemId);
         bom.setQuantity(new BigDecimal("2")); // 用料比例 = 2
         when(routeProductBomService.getRouteProductBomList(any(), any(), any()))
-                .thenReturn(List.of(bom));
+                .thenReturn(ListUtil.of(bom));
         when(materialStockService.getMaterialStockList(any(MesWmMaterialStockListReqVO.class)))
                 .thenReturn(Collections.emptyList());
@@ -229,7 +228,7 @@ public class MesWmItemConsumeServiceImplTest extends BaseDbUnitTest {
         bom.setItemId(bomItemId);
         bom.setQuantity(new BigDecimal("3")); // 消耗 = 3 × 10 = 30
         when(routeProductBomService.getRouteProductBomList(any(), any(), any()))
-                .thenReturn(List.of(bom));
+                .thenReturn(ListUtil.of(bom));
         Long stockId = randomLongId();
         Long batchId = randomLongId();
@@ -240,7 +239,7 @@ public class MesWmItemConsumeServiceImplTest extends BaseDbUnitTest {
         stock.setBatchId(batchId);
         stock.setBatchCode("BATCH-001");
         when(materialStockService.getMaterialStockList(any(MesWmMaterialStockListReqVO.class)))
-                .thenReturn(List.of(stock));
+                .thenReturn(ListUtil.of(stock));
         // 调用
         MesWmItemConsumeDO result = itemConsumeService.generateItemConsume(feedback);
@@ -268,7 +267,7 @@ public class MesWmItemConsumeServiceImplTest extends BaseDbUnitTest {
         bom.setItemId(bomItemId);
         bom.setQuantity(new BigDecimal("3")); // 消耗 = 3 × 10 = 30
         when(routeProductBomService.getRouteProductBomList(any(), any(), any()))
-                .thenReturn(List.of(bom));
+                .thenReturn(ListUtil.of(bom));
         Long stockId1 = randomLongId();
         Long stockId2 = randomLongId();
@@ -321,7 +320,7 @@ public class MesWmItemConsumeServiceImplTest extends BaseDbUnitTest {
         bom.setItemId(bomItemId);
         bom.setQuantity(new BigDecimal("3")); // 消耗 = 3 × 10 = 30
         when(routeProductBomService.getRouteProductBomList(any(), any(), any()))
-                .thenReturn(List.of(bom));
+                .thenReturn(ListUtil.of(bom));
         Long stockId = randomLongId();
         MesWmMaterialStockDO stock = new MesWmMaterialStockDO();
@@ -331,7 +330,7 @@ public class MesWmItemConsumeServiceImplTest extends BaseDbUnitTest {
         stock.setBatchId(1L);
         stock.setBatchCode("BATCH-001");
         when(materialStockService.getMaterialStockList(any(MesWmMaterialStockListReqVO.class)))
-                .thenReturn(List.of(stock));
+                .thenReturn(ListUtil.of(stock));
         // 调用
         MesWmItemConsumeDO result = itemConsumeService.generateItemConsume(feedback);
@@ -383,7 +382,7 @@ public class MesWmItemConsumeServiceImplTest extends BaseDbUnitTest {
         when(materialStockService.getMaterialStockList(argThat((MesWmMaterialStockListReqVO req) ->
                 req != null && itemA.equals(req.getItemId()))))
-                .thenReturn(List.of(stockA));
+                .thenReturn(ListUtil.of(stockA));
         when(materialStockService.getMaterialStockList(argThat((MesWmMaterialStockListReqVO req) ->
                 req != null && itemB.equals(req.getItemId()))))
                 .thenReturn(Collections.emptyList());
 package cn.iocoder.yudao.module.mes.service.wm.productproduce;
+import cn.hutool.core.collection.ListUtil;
 import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest;
-import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productproduce.MesWmProductProduceDetailDO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productproduce.MesWmProductProduceDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productproduce.MesWmProductProduceDetailDO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productproduce.MesWmProductProduceLineDO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseAreaDO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseDO;
@@ -23,11 +24,11 @@ import org.springframework.context.annotation.Import;
 import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import java.math.BigDecimal;
-import java.util.List;
 import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomLongId;
 import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomPojo;
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.mockito.Mockito.*;
 /**
@@ -92,7 +93,7 @@ public class MesWmProductProduceServiceImplTest extends BaseDbUnitTest {
                 .qualityStatus(MesWmQualityStatusEnum.PENDING.getStatus())
                 .build();
         when(productProduceLineService.getProductProduceLineListByProduceId(produce.getId()))
-                .thenReturn(List.of(pendingLine));
+                .thenReturn(ListUtil.of(pendingLine));
         // mock: finishProductProduce 内部会再查一次行和明细（用于创建库存事务）
         // 由于 finishProductProduce 在拆分行后调用，此时行已经变了，但由于 line/detail 是 mock 的，
@@ -109,8 +110,8 @@ public class MesWmProductProduceServiceImplTest extends BaseDbUnitTest {
                 .build();
         // finishProductProduce 内部第二次调用 getProductProduceLineListByProduceId
         when(productProduceLineService.getProductProduceLineListByProduceId(produce.getId()))
-                .thenReturn(List.of(pendingLine))         // 第 1 次：splitPendingAndFinishProduce 查待检行
-                .thenReturn(List.of(qualifiedLine, unqualifiedLine)); // 第 2 次：finishProductProduce 查所有行
+                .thenReturn(ListUtil.of(pendingLine))         // 第 1 次：splitPendingAndFinishProduce 查待检行
+                .thenReturn(ListUtil.of(qualifiedLine, unqualifiedLine)); // 第 2 次：finishProductProduce 查所有行
         // mock: finishProductProduce 中按行查明细
         MesWmProductProduceDetailDO qualifiedDetail = MesWmProductProduceDetailDO.builder()
@@ -118,9 +119,9 @@ public class MesWmProductProduceServiceImplTest extends BaseDbUnitTest {
         MesWmProductProduceDetailDO unqualifiedDetail = MesWmProductProduceDetailDO.builder()
                 .lineId(101L).quantity(BigDecimal.valueOf(20)).build();
         when(productProduceDetailService.getProductProduceDetailListByLineId(100L))
-                .thenReturn(List.of(qualifiedDetail));
+                .thenReturn(ListUtil.of(qualifiedDetail));
         when(productProduceDetailService.getProductProduceDetailListByLineId(101L))
-                .thenReturn(List.of(unqualifiedDetail));
+                .thenReturn(ListUtil.of(unqualifiedDetail));
         // 调用
         productProduceService.splitPendingAndFinishProduce(feedbackId, BigDecimal.valueOf(80), BigDecimal.valueOf(20));
@@ -185,14 +186,14 @@ public class MesWmProductProduceServiceImplTest extends BaseDbUnitTest {
                 .qualityStatus(MesWmQualityStatusEnum.PASS.getStatus())
                 .build();
         when(productProduceLineService.getProductProduceLineListByProduceId(produce.getId()))
-                .thenReturn(List.of(pendingLine))
-                .thenReturn(List.of(qualifiedLine));
+                .thenReturn(ListUtil.of(pendingLine))
+                .thenReturn(ListUtil.of(qualifiedLine));
         // mock: finishProductProduce 中按行查明细
         MesWmProductProduceDetailDO detail = MesWmProductProduceDetailDO.builder()
                 .lineId(200L).quantity(BigDecimal.valueOf(50)).build();
         when(productProduceDetailService.getProductProduceDetailListByLineId(200L))
-                .thenReturn(List.of(detail));
+                .thenReturn(ListUtil.of(detail));
         // 调用：不合格品数量 = 0
         productProduceService.splitPendingAndFinishProduce(feedbackId, BigDecimal.valueOf(50), BigDecimal.ZERO);
@@ -245,7 +246,7 @@ public class MesWmProductProduceServiceImplTest extends BaseDbUnitTest {
                 .qualityStatus(MesWmQualityStatusEnum.PASS.getStatus())
                 .build();
         when(productProduceLineService.getProductProduceLineListByProduceId(produce.getId()))
-                .thenReturn(List.of(passLine));
+                .thenReturn(ListUtil.of(passLine));
         // 调用，应该抛异常（找不到 PENDING 行）
         assertThrows(Exception.class, () ->