From 31d2efd1d4bb4aaac5c126fdd3af164bbfa7a270 Mon Sep 17 00:00:00 2001 From: gaoqr <13665037151@163.com> Date: Wed, 2 Apr 2025 16:17:31 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E7=A6=85=E9=81=93#1445=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E4=BF=AE=E5=A4=8D=EF=BC=8C=E5=85=A5=E5=8F=82=E5=BF=85?= =?UTF-8?q?=E5=A1=AB=E6=A0=A1=E9=AA=8C=E5=AE=8C=E5=96=84=EF=BC=9B2?= =?UTF-8?q?=E3=80=81=E5=B0=81=E8=BE=B9=E7=B3=BB=E7=BB=9F=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E5=85=BC=E5=AE=B9double=E7=B1=BB=E5=9E=8B=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/admin/orderImport/OrderImportController.java | 3 ++- .../webcad/vo/WebCadDataDoubleRoomTreeReqVO.java | 4 ++++ .../admin/orderImport/webcad/vo/WebCadDataOrderReqVO.java | 2 ++ .../admin/orderImport/webcad/vo/WebCadDataReqVO.java | 5 +++-- .../orderImport/factory/WebCadOrderImportFactory.java | 2 +- .../api/systemconfig/dto/SystemConfigSealEdgeRespDTO.java | 6 +++--- 6 files changed, 15 insertions(+), 7 deletions(-) diff --git a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/admin/orderImport/OrderImportController.java b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/admin/orderImport/OrderImportController.java index 402d0d170..698cd8f92 100644 --- a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/admin/orderImport/OrderImportController.java +++ b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/admin/orderImport/OrderImportController.java @@ -14,6 +14,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; +import javax.validation.Valid; import static com.cf.imes.framework.operatelog.core.enums.OperateTypeEnum.IMPORT; @@ -33,7 +34,7 @@ public class OrderImportController { @PostMapping("/webcad/import") @Operation(summary = "webcad拆单导入生产单") @OperateLog(type = IMPORT) - public CommonResult webCadOrderImport(@RequestBody WebCadDataReqVO webCadDataReqVO) { + public CommonResult webCadOrderImport(@RequestBody @Valid WebCadDataReqVO webCadDataReqVO) { webCadOrderImportService.webCadOrderImport(webCadDataReqVO); return CommonResult.success(true); } diff --git a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/admin/orderImport/webcad/vo/WebCadDataDoubleRoomTreeReqVO.java b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/admin/orderImport/webcad/vo/WebCadDataDoubleRoomTreeReqVO.java index 20c449d74..39e806506 100644 --- a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/admin/orderImport/webcad/vo/WebCadDataDoubleRoomTreeReqVO.java +++ b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/admin/orderImport/webcad/vo/WebCadDataDoubleRoomTreeReqVO.java @@ -3,6 +3,8 @@ package com.cf.imes.module.plan.controller.admin.orderImport.webcad.vo; import lombok.Data; import lombok.NoArgsConstructor; +import javax.validation.Valid; +import javax.validation.constraints.NotNull; import java.util.List; /** @@ -18,6 +20,7 @@ public class WebCadDataDoubleRoomTreeReqVO { private Integer count; + @Valid private List children; @NoArgsConstructor @@ -26,6 +29,7 @@ public class WebCadDataDoubleRoomTreeReqVO { private String name; + @NotNull(message = "房间倍数不能为空") private Integer count; } } diff --git a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/admin/orderImport/webcad/vo/WebCadDataOrderReqVO.java b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/admin/orderImport/webcad/vo/WebCadDataOrderReqVO.java index ee092d0eb..5371bc4dc 100644 --- a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/admin/orderImport/webcad/vo/WebCadDataOrderReqVO.java +++ b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/admin/orderImport/webcad/vo/WebCadDataOrderReqVO.java @@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; +import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; /** @@ -18,5 +19,6 @@ public class WebCadDataOrderReqVO { */ @JsonProperty(value = "OrderNo") @NotNull(message = "生产单号不能为空") + @NotEmpty(message = "生产单号不能为空") private String OrderNo; } diff --git a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/admin/orderImport/webcad/vo/WebCadDataReqVO.java b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/admin/orderImport/webcad/vo/WebCadDataReqVO.java index 9277ac01e..81ff96457 100644 --- a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/admin/orderImport/webcad/vo/WebCadDataReqVO.java +++ b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/admin/orderImport/webcad/vo/WebCadDataReqVO.java @@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; +import javax.validation.Valid; import java.util.List; /** @@ -15,6 +16,7 @@ import java.util.List; public class WebCadDataReqVO { @JsonProperty(value = "Orders") + @Valid private WebCadDataOrderReqVO orders; @JsonProperty(value = "Materials") @@ -29,7 +31,6 @@ public class WebCadDataReqVO { @JsonProperty(value = "ProcessGroup") private List ProcessGroup; + @Valid private List douleRoomTree; - - private String orderType; } diff --git a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/WebCadOrderImportFactory.java b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/WebCadOrderImportFactory.java index a19df3a70..0846de04c 100644 --- a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/WebCadOrderImportFactory.java +++ b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/WebCadOrderImportFactory.java @@ -288,7 +288,7 @@ public class WebCadOrderImportFactory { String widthValue = jsonObject.getString("widthValue"); if (StringUtils.isNotEmpty(widthMin) && StringUtils.isNotEmpty(widthMax) && StringUtils.isNotEmpty(widthValue)) { - sealEdgeConfigList.add(new SystemConfigSealEdgeRespDTO(Integer.parseInt(widthMin), Integer.parseInt(widthMax), Integer.parseInt(widthValue))); + sealEdgeConfigList.add(new SystemConfigSealEdgeRespDTO(NumberUtil.parseDouble(widthMin), NumberUtil.parseDouble(widthMax), NumberUtil.parseDouble(widthValue))); } } } diff --git a/cf-module-system/cf-module-system-api/src/main/java/com/cf/imes/module/system/api/systemconfig/dto/SystemConfigSealEdgeRespDTO.java b/cf-module-system/cf-module-system-api/src/main/java/com/cf/imes/module/system/api/systemconfig/dto/SystemConfigSealEdgeRespDTO.java index 6a4115535..eae95ee77 100644 --- a/cf-module-system/cf-module-system-api/src/main/java/com/cf/imes/module/system/api/systemconfig/dto/SystemConfigSealEdgeRespDTO.java +++ b/cf-module-system/cf-module-system-api/src/main/java/com/cf/imes/module/system/api/systemconfig/dto/SystemConfigSealEdgeRespDTO.java @@ -20,15 +20,15 @@ public class SystemConfigSealEdgeRespDTO implements Serializable { /** * 宽最小值 */ - private int widthMin; + private double widthMin; /** * 宽最大值 */ - private int widthMax; + private double widthMax; /** * 宽取值a */ - private int widthValue; + private double widthValue; }