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; /** * 检验数量,即送检数量