From f49df6a5b73a49bd147cbf6e450e7cf536508153 Mon Sep 17 00:00:00 2001 From: liuzhaotian Date: Tue, 17 Dec 2024 10:39:05 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A6=85=E9=81=93Bug968=EF=BC=8C820=EF=BC=8C66?= =?UTF-8?q?5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../plan/saveOptimize/SavePlanPlateResultReqVO.java | 2 -- .../module/executor/service/plate/PlateServiceImpl.java | 9 +++++++-- .../module/system/service/lable/LabelServiceImpl.java | 7 ++++--- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/saveOptimize/SavePlanPlateResultReqVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/saveOptimize/SavePlanPlateResultReqVO.java index 668ccf0af..80ca56353 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/saveOptimize/SavePlanPlateResultReqVO.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/saveOptimize/SavePlanPlateResultReqVO.java @@ -12,8 +12,6 @@ import java.util.List; public class SavePlanPlateResultReqVO { - - @Schema(description = "优化后的大板列表数据", requiredMode = Schema.RequiredMode.REQUIRED) @NotEmpty(message = "优化数据异常，请重新进行优化") private List optimizeBoardModelDOS; diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plate/PlateServiceImpl.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plate/PlateServiceImpl.java index 7c8bba0d7..92835e258 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plate/PlateServiceImpl.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plate/PlateServiceImpl.java @@ -350,7 +350,12 @@ public class PlateServiceImpl implements PlateService { PlateDO plateDO = BeanUtils.toBean(reqVO, PlateDO.class); - plateDO.setRemark(reqVO.getRemake1() +","+ reqVO.getRemake2()); + + String remake1 = reqVO.getRemake1() == null ? "" : reqVO.getRemake1() + ";" ; + + String remake2 = reqVO.getRemake2() == null ? "" : reqVO.getRemake2(); + + plateDO.setRemark(remake1+remake2); plateDO.setHoleArrange(reqVO.getPlaceHole()); plateDO.setGoodsId(goodsDO.getId()); plateDO.setThickness(goodsDO.getThickness()); @@ -358,7 +363,7 @@ public class PlateServiceImpl implements PlateService { plateDO.setPlateNo((obtainingTime) + Long.toString(plateNo).substring(2)); plateDO.setType(OrderPlateTypeEnum.SELFINCREASINGBOARD.getType()); - plateDO.setArea(reqVO.getWidth().multiply(reqVO.getHeight()).movePointLeft(4).stripTrailingZeros()); + plateDO.setArea(reqVO.getWidth().multiply(reqVO.getHeight()).movePointLeft(6).stripTrailingZeros()); plateDOS.add(plateDO); } diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/lable/LabelServiceImpl.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/lable/LabelServiceImpl.java index 4d59743df..20d07c2d6 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/lable/LabelServiceImpl.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/lable/LabelServiceImpl.java @@ -102,9 +102,10 @@ public class LabelServiceImpl implements LabelService { packageConfigDOS.forEach(f -> { JsonNode packConfig = parseTree(unzipString(f.getSetting())); - labelId.add(packConfig.get("partLabelId").asLong()); - labelId.add(packConfig.get("orderLabelId").asLong()); - labelId.add(packConfig.get("plateLabelId").asLong()); + + labelId.add(packConfig.get("partLabelId") == null ? null : packConfig.get("partLabelId").asLong()); + labelId.add(packConfig.get("orderLabelId") == null ? null : packConfig.get("orderLabelId").asLong()); + labelId.add(packConfig.get("plateLabelId") == null ? null : packConfig.get("plateLabelId").asLong()); });