From 357366b84d5ad6768add3deffe146181b5d19fc6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Thu, 23 Apr 2026 10:11:55 +0800 Subject: [PATCH] =?UTF-8?q?refactor(task):=20=E7=BB=9F=E4=B8=80=E6=9D=A5?= =?UTF-8?q?=E6=96=99=E6=A3=80=E6=B5=8B=E4=BB=BB=E5=8A=A1=E4=B8=AD=E6=A3=80?= =?UTF-8?q?=E9=AA=8C=E7=B1=BB=E5=9E=8B=E4=B8=BA=E6=95=B4=E6=95=B0=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 将QmsIncomingInspectionTask、QmsIncomingInspectionTaskSearchQO和QmsIncomingInspectionTaskVO中的inspectionType由Long改为Integer - 去除来料检测任务中根据字典项Id获取检验类型的逻辑，直接使用请求中的类型值 - 修改注释说明检验类型仅支持0（来料检测）和1（盘库检测） - 保持检验类型字段与业务实际类型对应，简化代码逻辑 --- .../service/IncomingInspectionTaskControllerService.java | 8 +------- .../common/pojo/qo/QmsIncomingInspectionTaskSearchQO.java | 4 ++-- .../wms/common/pojo/vo/QmsIncomingInspectionTaskVO.java | 4 ++-- .../wms/repository/entity/QmsIncomingInspectionTask.java | 4 ++-- 4 files changed, 7 insertions(+), 13 deletions(-) diff --git a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/IncomingInspectionTaskControllerService.java b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/IncomingInspectionTaskControllerService.java index 075b8430..60096311 100644 --- a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/IncomingInspectionTaskControllerService.java +++ b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/IncomingInspectionTaskControllerService.java @@ -148,12 +148,6 @@ public class IncomingInspectionTaskControllerService { LocalDateTime requiredFinishTime = now.plusDays(standard.getInspectionCycle()); // 7. 构建并保存来料检测任务 - Long inspectionType = switch (request.getType()) { - case 0 -> dictionaryItemService.getIdByCode("TypeOfIncomingInspection", "IncomingInspection"); - case 1 -> dictionaryItemService.getIdByCode("TypeOfIncomingInspection", "InventoryDetection"); - default -> throw new NflgException(STATE.BusinessError, "不支持的检验类型"); - }; - VUtil.trueThrowBusinessError(Objects.isNull(inspectionType)).throwMessage("检验类型不存在"); QmsIncomingInspectionTask task = new QmsIncomingInspectionTask() .setTaskNo(taskNo) .setMaterialId(material.getId()) @@ -165,7 +159,7 @@ public class IncomingInspectionTaskControllerService { .setPurchaseOrderNo(request.getPurchaseOrderNo()) .setPurchaseOrderLine(request.getPurchaseOrderLine()) .setFactory(request.getFactory()) - .setInspectionType(inspectionType) + .setInspectionType(request.getType()) .setInspectionQty(request.getInspectionQty()) .setInspectionStatus((short) 0) .setInspectorId(inspectorId) diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsIncomingInspectionTaskSearchQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsIncomingInspectionTaskSearchQO.java index f615ba69..d08f5b7d 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsIncomingInspectionTaskSearchQO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsIncomingInspectionTaskSearchQO.java @@ -58,9 +58,9 @@ public class QmsIncomingInspectionTaskSearchQO extends PageQO { private Boolean isOverdue; /** - * 检测类型（字典项id） + * 检测类型，0：来料检测；1：盘库检测 */ - private Long inspectionType; + private Integer inspectionType; /** * 送检日期开始 diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsIncomingInspectionTaskVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsIncomingInspectionTaskVO.java index 9a699506..fc142090 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsIncomingInspectionTaskVO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsIncomingInspectionTaskVO.java @@ -83,9 +83,9 @@ public class QmsIncomingInspectionTaskVO { private String factory; /** - * 检测类型（字典项id） + * 检测类型，0：来料检测；1：盘库检测 */ - private Long inspectionType; + private Integer inspectionType; /** * 检验数量 diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/QmsIncomingInspectionTask.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/QmsIncomingInspectionTask.java index 05345183..aa81a41d 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/QmsIncomingInspectionTask.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/QmsIncomingInspectionTask.java @@ -82,9 +82,9 @@ public class QmsIncomingInspectionTask implements Serializable { private String factory; /** - * 检测类型，字典项id + * 检测类型，0：来料检测；1：盘库检测 */ - private Long inspectionType; + private Integer inspectionType; /** * 检验数量，即送检数量