diff --git a/yudao-framework/yudao-spring-boot-starter-excel/src/test/java/cn/iocoder/yudao/framework/dict/core/util/DictFrameworkUtilsTest.java b/yudao-framework/yudao-spring-boot-starter-excel/src/test/java/cn/iocoder/yudao/framework/dict/core/util/DictFrameworkUtilsTest.java index fa0d172..7a01bb2 100644 --- a/yudao-framework/yudao-spring-boot-starter-excel/src/test/java/cn/iocoder/yudao/framework/dict/core/util/DictFrameworkUtilsTest.java +++ b/yudao-framework/yudao-spring-boot-starter-excel/src/test/java/cn/iocoder/yudao/framework/dict/core/util/DictFrameworkUtilsTest.java @@ -1,5 +1,6 @@ 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 dictDatas = List.of( + List 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 dictDatas = List.of( + List dictDatas = ListUtil.of( randomPojo(DictDataRespDTO.class, o -> o.setDictType("animal").setValue("cat").setLabel("猫")), randomPojo(DictDataRespDTO.class, o -> o.setDictType("animal").setValue("dog").setLabel("狗")) ); diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/andon/MesProAndonConfigController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/andon/MesProAndonConfigController.java index 6518380..e4d9df3 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/andon/MesProAndonConfigController.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/andon/MesProAndonConfigController.java @@ -1,6 +1,7 @@ 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") diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/andon/MesProAndonRecordController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/andon/MesProAndonRecordController.java index 314ca40..a8ea391 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/andon/MesProAndonRecordController.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/andon/MesProAndonRecordController.java @@ -1,6 +1,7 @@ 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") diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/card/MesProCardController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/card/MesProCardController.java index 9481d82..1fe17f5 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/card/MesProCardController.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/card/MesProCardController.java @@ -1,6 +1,7 @@ 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") diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/card/MesProCardProcessController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/card/MesProCardProcessController.java index 171e36d..458fa6a 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/card/MesProCardProcessController.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/card/MesProCardProcessController.java @@ -1,6 +1,7 @@ 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") diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/feedback/MesProFeedbackController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/feedback/MesProFeedbackController.java index 99dde54..f601f05 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/feedback/MesProFeedbackController.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/feedback/MesProFeedbackController.java @@ -1,6 +1,7 @@ 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") diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/route/MesProRouteProcessController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/route/MesProRouteProcessController.java index d09cad6..ca2d03e 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/route/MesProRouteProcessController.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/route/MesProRouteProcessController.java @@ -1,6 +1,7 @@ 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); } } diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/route/MesProRouteProductBomController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/route/MesProRouteProductBomController.java index 6fc55bc..3c67bb4 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/route/MesProRouteProductBomController.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/route/MesProRouteProductBomController.java @@ -1,6 +1,7 @@ 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); } } diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/route/MesProRouteProductController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/route/MesProRouteProductController.java index 59a5e24..8aff7c2 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/route/MesProRouteProductController.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/route/MesProRouteProductController.java @@ -1,6 +1,7 @@ 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); } } diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/task/MesProTaskController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/task/MesProTaskController.java index 08ded4d..e43f327 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/task/MesProTaskController.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/task/MesProTaskController.java @@ -1,6 +1,7 @@ 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") diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/task/MesProTaskIssueController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/task/MesProTaskIssueController.java index f0f30d9..00fa9b5 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/task/MesProTaskIssueController.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/task/MesProTaskIssueController.java @@ -1,6 +1,7 @@ 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") diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/MesProWorkOrderBomController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/MesProWorkOrderBomController.java index 464d54d..c28878c 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/MesProWorkOrderBomController.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/MesProWorkOrderBomController.java @@ -1,6 +1,7 @@ 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") diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/MesProWorkOrderController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/MesProWorkOrderController.java index 7d7b678..f13810b 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/MesProWorkOrderController.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/MesProWorkOrderController.java @@ -1,6 +1,7 @@ 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") diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/cal/MesCalPlanStatusEnum.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/cal/MesCalPlanStatusEnum.java index c4cb84a..bbdad97 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/cal/MesCalPlanStatusEnum.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/cal/MesCalPlanStatusEnum.java @@ -15,7 +15,17 @@ import java.util.Arrays; @AllArgsConstructor public enum MesCalPlanStatusEnum implements ArrayValuable { + /** + * 草稿 + * + * 对应 MesCalPlanService#createPlan 方法 + */ PREPARE(0, "草稿"), + /** + * 已确认 + * + * 对应 MesCalPlanService#confirmPlan 方法 + */ CONFIRMED(1, "已确认"); public static final Integer[] ARRAYS = Arrays.stream(values()).map(MesCalPlanStatusEnum::getStatus).toArray(Integer[]::new); diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/cal/MesCalShiftTypeEnum.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/cal/MesCalShiftTypeEnum.java index f801e10..940cbc8 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/cal/MesCalShiftTypeEnum.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/cal/MesCalShiftTypeEnum.java @@ -1,5 +1,6 @@ package cn.iocoder.yudao.module.mes.enums.cal; +import cn.hutool.core.collection.ListUtil; import cn.hutool.core.lang.Pair; import cn.iocoder.yudao.framework.common.core.ArrayValuable; import lombok.AllArgsConstructor; @@ -17,14 +18,14 @@ import java.util.List; @AllArgsConstructor public enum MesCalShiftTypeEnum implements ArrayValuable { - SINGLE(1, "单白班", List.of( + SINGLE(1, "单白班", ListUtil.of( Pair.of("白班", new String[]{"08:00", "17:00"}) )), - TWO(2, "两班倒", List.of( + TWO(2, "两班倒", ListUtil.of( Pair.of("白班", new String[]{"08:00", "20:00"}), Pair.of("夜班", new String[]{"20:00", "08:00"}) )), - THREE(3, "三班倒", List.of( + THREE(3, "三班倒", ListUtil.of( Pair.of("白班", new String[]{"08:00", "16:00"}), Pair.of("中班", new String[]{"16:00", "00:00"}), Pair.of("夜班", new String[]{"00:00", "08:00"}) diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/dv/MesDvCheckPlanStatusEnum.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/dv/MesDvCheckPlanStatusEnum.java index c378520..0c7fa48 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/dv/MesDvCheckPlanStatusEnum.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/dv/MesDvCheckPlanStatusEnum.java @@ -15,7 +15,17 @@ import java.util.Arrays; @AllArgsConstructor public enum MesDvCheckPlanStatusEnum implements ArrayValuable { + /** + * 草稿 + * + * 对应 MesDvCheckPlanService#createCheckPlan 方法 + */ PREPARE(0, "草稿"), + /** + * 已启用 + * + * 对应 MesDvCheckPlanService#enableCheckPlan 方法 + */ ENABLED(1, "已启用"); public static final Integer[] ARRAYS = Arrays.stream(values()).map(MesDvCheckPlanStatusEnum::getStatus).toArray(Integer[]::new); diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/dv/MesDvCheckRecordStatusEnum.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/dv/MesDvCheckRecordStatusEnum.java index ce675a1..df93cfb 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/dv/MesDvCheckRecordStatusEnum.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/dv/MesDvCheckRecordStatusEnum.java @@ -15,7 +15,17 @@ import java.util.Arrays; @AllArgsConstructor public enum MesDvCheckRecordStatusEnum implements ArrayValuable { + /** + * 草稿 + * + * 对应 MesDvCheckRecordService#createCheckRecord 方法 + */ DRAFT(10, "草稿"), + /** + * 已完成 + * + * 对应 MesDvCheckRecordService#submitCheckRecord 方法 + */ FINISHED(20, "已完成"); public static final Integer[] ARRAYS = Arrays.stream(values()).map(MesDvCheckRecordStatusEnum::getStatus).toArray(Integer[]::new); diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/dv/MesDvMaintenRecordStatusEnum.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/dv/MesDvMaintenRecordStatusEnum.java index 4ebf320..dd755ec 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/dv/MesDvMaintenRecordStatusEnum.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/dv/MesDvMaintenRecordStatusEnum.java @@ -15,7 +15,17 @@ import java.util.Arrays; @AllArgsConstructor public enum MesDvMaintenRecordStatusEnum implements ArrayValuable { + /** + * 草稿 + * + * 对应 MesDvMaintenRecordService#createMaintenRecord 方法 + */ PREPARE(1, "草稿"), + /** + * 已提交 + * + * 对应 MesDvMaintenRecordService#submitMaintenRecord 方法 + */ SUBMITTED(2, "已提交"); public static final Integer[] ARRAYS = Arrays.stream(values()).map(MesDvMaintenRecordStatusEnum::getStatus) diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/pro/MesProAndonStatusEnum.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/pro/MesProAndonStatusEnum.java index 3a7f759..5f79b2a 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/pro/MesProAndonStatusEnum.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/pro/MesProAndonStatusEnum.java @@ -15,7 +15,17 @@ import java.util.Arrays; @AllArgsConstructor public enum MesProAndonStatusEnum implements ArrayValuable { + /** + * 未处置 + * + * 对应 MesProAndonRecordService#createAndonRecord 方法 + */ ACTIVE(0, "未处置"), + /** + * 已处置 + * + * 对应 MesProAndonRecordService#updateAndonRecord 方法 + */ HANDLED(1, "已处置"); public static final Integer[] ARRAYS = Arrays.stream(values()).map(MesProAndonStatusEnum::getStatus).toArray(Integer[]::new); diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/pro/MesProWorkOrderStatusEnum.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/pro/MesProWorkOrderStatusEnum.java index 1bd2ffa..d1e8262 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/pro/MesProWorkOrderStatusEnum.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/pro/MesProWorkOrderStatusEnum.java @@ -15,9 +15,29 @@ import java.util.Arrays; @AllArgsConstructor public enum MesProWorkOrderStatusEnum implements ArrayValuable { + /** + * 草稿 + * + * 对应 MesProWorkOrderService#createWorkOrder 方法 + */ PREPARE(0, "草稿"), + /** + * 已确认 + * + * 对应 MesProWorkOrderService#confirmWorkOrder 方法 + */ CONFIRMED(1, "已确认"), + /** + * 已完成 + * + * 对应 MesProWorkOrderService#finishWorkOrder 方法 + */ FINISHED(2, "已完成"), + /** + * 已取消 + * + * 对应 MesProWorkOrderService#cancelWorkOrder 方法 + */ CANCELED(3, "已取消"); public static final Integer[] ARRAYS = Arrays.stream(values()).map(MesProWorkOrderStatusEnum::getStatus).toArray(Integer[]::new); diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/tm/tool/MesTmToolServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/tm/tool/MesTmToolServiceImpl.java index fe707fd..78570db 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/tm/tool/MesTmToolServiceImpl.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/tm/tool/MesTmToolServiceImpl.java @@ -1,5 +1,6 @@ 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 getToolList(Collection ids) { if (ids == null || ids.isEmpty()) { - return List.of(); + return ListUtil.of(); } return toolMapper.selectBatchIds(ids); } diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/outsourceissue/MesWmOutsourceIssueServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/outsourceissue/MesWmOutsourceIssueServiceImpl.java index 3193f3c..9a8e18e 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/outsourceissue/MesWmOutsourceIssueServiceImpl.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/outsourceissue/MesWmOutsourceIssueServiceImpl.java @@ -1,6 +1,7 @@ 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 details = detailMap.getOrDefault(line.getId(), List.of()); + List 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 details = detailMap.getOrDefault(line.getId(), List.of()); + List details = detailMap.getOrDefault(line.getId(), ListUtil.of()); BigDecimal totalDetailQuantity = CollectionUtils.getSumValue(details, MesWmOutsourceIssueDetailDO::getQuantity, BigDecimal::add, BigDecimal.ZERO); // 对比行数量与明细总数量 diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/outsourcereceipt/MesWmOutsourceReceiptServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/outsourcereceipt/MesWmOutsourceReceiptServiceImpl.java index 88270fb..8812bba 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/outsourcereceipt/MesWmOutsourceReceiptServiceImpl.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/outsourcereceipt/MesWmOutsourceReceiptServiceImpl.java @@ -1,6 +1,7 @@ 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 details = detailMap.getOrDefault(line.getId(), List.of()); + List details = detailMap.getOrDefault(line.getId(), ListUtil.of()); BigDecimal totalDetailQuantity = CollectionUtils.getSumValue(details, MesWmOutsourceReceiptDetailDO::getQuantity, BigDecimal::add, BigDecimal.ZERO); // 对比行数量与明细总数量,不满足直接抛出 diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnissue/MesWmReturnIssueServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnissue/MesWmReturnIssueServiceImpl.java index 361ee80..250740a 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnissue/MesWmReturnIssueServiceImpl.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnissue/MesWmReturnIssueServiceImpl.java @@ -1,6 +1,7 @@ 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 details = detailMap.getOrDefault(line.getId(), List.of()); + List details = detailMap.getOrDefault(line.getId(), ListUtil.of()); BigDecimal totalDetailQuantity = CollectionUtils.getSumValue(details, MesWmReturnIssueDetailDO::getQuantity, BigDecimal::add, BigDecimal.ZERO); // 对比行数量与明细总数量,不满足直接抛出 diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnsales/MesWmReturnSalesServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnsales/MesWmReturnSalesServiceImpl.java index 2347dfd..0e6cd01 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnsales/MesWmReturnSalesServiceImpl.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnsales/MesWmReturnSalesServiceImpl.java @@ -1,6 +1,7 @@ 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 details = detailMap.getOrDefault(line.getId(), List.of()); + List details = detailMap.getOrDefault(line.getId(), ListUtil.of()); BigDecimal totalDetailQuantity = CollectionUtils.getSumValue(details, MesWmReturnSalesDetailDO::getQuantity, BigDecimal::add, BigDecimal.ZERO); // 对比行数量与明细总数量,不满足直接抛出 diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/transfer/MesWmTransferServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/transfer/MesWmTransferServiceImpl.java index 9edc490..4bbb841 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/transfer/MesWmTransferServiceImpl.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/transfer/MesWmTransferServiceImpl.java @@ -1,6 +1,7 @@ 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 details = detailMap.getOrDefault(line.getId(), List.of()); + List details = detailMap.getOrDefault(line.getId(), ListUtil.of()); for (MesWmTransferDetailDO detail : details) { // 2.1 先执行出库:调拨移出(从源仓库扣减库存),出库数量基于当前明细的数量 Long outTransactionId = wmTransactionService.createTransaction(new MesWmTransactionSaveReqDTO() 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 f2bb17d..8c24869 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 @@ -1,5 +1,6 @@ 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(), diff --git a/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/wm/itemconsume/MesWmItemConsumeServiceImplTest.java b/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/wm/itemconsume/MesWmItemConsumeServiceImplTest.java index c5e2e09..00b5f85 100644 --- a/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/wm/itemconsume/MesWmItemConsumeServiceImplTest.java +++ b/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/wm/itemconsume/MesWmItemConsumeServiceImplTest.java @@ -1,5 +1,6 @@ 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()); diff --git a/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/wm/productproduce/MesWmProductProduceServiceImplTest.java b/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/wm/productproduce/MesWmProductProduceServiceImplTest.java index 3ea0824..43b7472 100644 --- a/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/wm/productproduce/MesWmProductProduceServiceImplTest.java +++ b/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/wm/productproduce/MesWmProductProduceServiceImplTest.java @@ -1,8 +1,9 @@ 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, () ->