From a1e477d9996068370cd21f6a51194d7e0cceb892 Mon Sep 17 00:00:00 2001 From: liuzhaotian Date: Fri, 28 Mar 2025 10:05:06 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A6=85=E9=81=93=201440=20=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../executor/controller/admin/plan/vo/SavePlanPlateList.java | 3 ++- .../executor/dal/dataobject/goods/OptimizeBoardModelDO.java | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/SavePlanPlateList.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/SavePlanPlateList.java index 7dedf0f3c..658c45859 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/SavePlanPlateList.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/SavePlanPlateList.java @@ -7,6 +7,7 @@ import lombok.Data; import javax.validation.Valid; import javax.validation.constraints.NotNull; +import java.math.BigDecimal; import java.util.List; /** @@ -70,7 +71,7 @@ public class SavePlanPlateList { @Schema(description = "大板的厚度") - private Integer thickness; + private BigDecimal thickness; @Schema(description = "大板的颜色") diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/goods/OptimizeBoardModelDO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/goods/OptimizeBoardModelDO.java index 84557c810..1b785f1a9 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/goods/OptimizeBoardModelDO.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/goods/OptimizeBoardModelDO.java @@ -188,6 +188,10 @@ public class OptimizeBoardModelDO extends ESDocument { public void setRemainBoardList(Object remainBoardList) { if (remainBoardList instanceof String && ((String) remainBoardList).isEmpty()) { this.remainBoardList = new ArrayList<>(); + } else if (remainBoardList instanceof List) { + this.remainBoardList = (List) remainBoardList; + } else { + this.remainBoardList = new ArrayList<>(); } }