diff --git a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/QmsApplication.java b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/QmsApplication.java index c1607c52..7801c664 100644 --- a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/QmsApplication.java +++ b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/QmsApplication.java @@ -19,7 +19,7 @@ public class QmsApplication { public static void main(String[] args) { SpringApplication.run(QmsApplication.class, args); - log.info("【QMS】服务已启动"); + log.info("【QMS】admin服务已启动"); log.info("---------------------- Sa-Token SSO 模式二 Client 端启动成功 ----------------------"); log.info("配置信息：" + SaSsoManager.getClientConfig()); } diff --git a/nflg-qms-admin/src/test/java/com/nflg/qms/admin/ExternalIncomingInspectionTaskApiTest.java b/nflg-qms-admin/src/test/java/com/nflg/qms/admin/ExternalIncomingInspectionTaskApiTest.java index a262897a..a1fdca02 100644 --- a/nflg-qms-admin/src/test/java/com/nflg/qms/admin/ExternalIncomingInspectionTaskApiTest.java +++ b/nflg-qms-admin/src/test/java/com/nflg/qms/admin/ExternalIncomingInspectionTaskApiTest.java @@ -12,8 +12,6 @@ import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestMethodOrder; -import java.math.BigDecimal; - /** * 对外接口-来料检验申请 接口测试 *

@@ -100,6 +98,7 @@ public class ExternalIncomingInspectionTaskApiTest { request.setDeliveryOrderLine("10"); request.setPurchaseOrderNo("PO20240101001"); request.setPurchaseOrderLine("20"); + request.setType(0); ApiResult result = post("/external/incoming-inspection-task/apply", request, new TypeReference<>() {}); assertSuccess(result, "完整参数来料检验申请失败"); @@ -207,11 +206,12 @@ public class ExternalIncomingInspectionTaskApiTest { public void test09_apply_InspectionQtyZero() { ExternalIncomingInspectionApplyQO request = buildValidApplyRequest(); request.setMaterialNo(VALID_MATERIAL_NO); - request.setInspectionQty(BigDecimal.ZERO); + request.setInspectionQty(0); + request.setType(0); ApiResult result = post("/external/incoming-inspection-task/apply", request, new TypeReference<>() {}); // 若业务不允许0数量，则改为 assertFailed - assertSuccess(result, "检验数量为零的申请失败"); + assertFailed(result, "检验数量为零的申请失败"); System.out.println(" ✅ 检验数量为零的申请成功"); } @@ -225,7 +225,8 @@ public class ExternalIncomingInspectionTaskApiTest { ExternalIncomingInspectionApplyQO request = new ExternalIncomingInspectionApplyQO(); request.setMaterialNo(VALID_MATERIAL_NO); request.setFactory(VALID_FACTORY); - request.setInspectionQty(new BigDecimal("100")); + request.setInspectionQty(100); + request.setType(0); ApiResult result = post("/external/incoming-inspection-task/apply", request, new TypeReference<>() {}); assertSuccess(result, "仅必填字段来料检验申请失败"); @@ -241,7 +242,8 @@ public class ExternalIncomingInspectionTaskApiTest { ExternalIncomingInspectionApplyQO request = new ExternalIncomingInspectionApplyQO(); request.setMaterialNo(VALID_MATERIAL_NO); request.setFactory(VALID_FACTORY); - request.setInspectionQty(new BigDecimal("100")); + request.setInspectionQty(100); + request.setType(0); return request; } } diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/ExternalIncomingInspectionApplyQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/ExternalIncomingInspectionApplyQO.java index f33c487e..1c2f33aa 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/ExternalIncomingInspectionApplyQO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/ExternalIncomingInspectionApplyQO.java @@ -1,11 +1,10 @@ package com.nflg.wms.common.pojo.qo; +import jakarta.validation.constraints.Min; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import lombok.Data; -import java.math.BigDecimal; - /** * 对外接口-来料检验申请 QO */ @@ -64,5 +63,6 @@ public class ExternalIncomingInspectionApplyQO { * 检验数量（必填），即送检数量 */ @NotNull(message = "检验数量不能为空") - private BigDecimal inspectionQty; + @Min(value = 1, message = "检验数量必须大于0") + private Integer inspectionQty; } 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 14ddceb5..9a699506 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 @@ -2,7 +2,6 @@ package com.nflg.wms.common.pojo.vo; import lombok.Data; -import java.math.BigDecimal; import java.time.LocalDateTime; /** @@ -91,17 +90,17 @@ public class QmsIncomingInspectionTaskVO { /** * 检验数量 */ - private BigDecimal inspectionQty; + private Integer inspectionQty; /** * 合格数量 */ - private BigDecimal qualifiedQty; + private Integer qualifiedQty; /** * 不合格数量 */ - private BigDecimal unqualifiedQty; + private Integer unqualifiedQty; /** * 检验状态：0=待检，1=已检 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 24b20785..05345183 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 @@ -9,7 +9,6 @@ import lombok.ToString; import lombok.experimental.Accessors; import java.io.Serializable; -import java.math.BigDecimal; import java.time.LocalDateTime; /** @@ -90,17 +89,17 @@ public class QmsIncomingInspectionTask implements Serializable { /** * 检验数量，即送检数量 */ - private BigDecimal inspectionQty; + private Integer inspectionQty; /** * 合格数量 */ - private BigDecimal qualifiedQty; + private Integer qualifiedQty; /** * 不合格数量 */ - private BigDecimal unqualifiedQty; + private Integer unqualifiedQty; /** * 检验状态：0=待检，1=检验中，2=已检