From 29ef237a0baea874ee2da5d43dd1c0d7cfc3424a Mon Sep 17 00:00:00 2001
From: yangsb <there-y@qq.com>
Date: Sun, 28 Apr 2024 10:55:35 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=92=E5=8D=95=E5=88=86=E9=A1=B5=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=95=86=E5=93=81=E9=A2=9C=E8=89=B2=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../module/executor/controller/admin/plan/vo/PlateInfoVO.java  | 3 +++
 .../cf/imes/module/executor/service/plan/PlanServiceImpl.java  | 1 +
 2 files changed, 4 insertions(+)

diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/PlateInfoVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/PlateInfoVO.java
index f20c42a65..36f3ceab7 100644
--- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/PlateInfoVO.java
+++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/PlateInfoVO.java
@@ -34,6 +34,9 @@ public class PlateInfoVO {
     @Schema(description = "面积")
     private BigDecimal area;
 
+    @Schema(description = "颜色")
+    private String color;
+
     @Schema(description = "数量")
     private Integer count;
 
diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plan/PlanServiceImpl.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plan/PlanServiceImpl.java
index 11daeb1ba..9fc720b68 100644
--- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plan/PlanServiceImpl.java
+++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plan/PlanServiceImpl.java
@@ -226,6 +226,7 @@ public class PlanServiceImpl implements PlanService {
                             .width(p.getWidth())
                             .height(p.getHeight())
                             .thickness(p.getThickness())
+                            .color(p.getColor())
                             .area(p.getHeight().multiply(p.getWidth()).setScale(2, RoundingMode.HALF_UP))
                             .count(plateDOS.stream().filter(f -> Objects.equals(f.getGoodsId(), p.getGoodsId())).collect(Collectors.toSet()).size())
                             .build())