diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/PlateDetailRespVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/PlateDetailRespVO.java index 5c72f29f6..e1f53e5dd 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/PlateDetailRespVO.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/PlateDetailRespVO.java @@ -59,6 +59,8 @@ public class PlateDetailRespVO { @Schema(description = "板颜色", requiredMode = Schema.RequiredMode.REQUIRED) private String color; + @Schema(description = "品牌", requiredMode = Schema.RequiredMode.REQUIRED) + private String brand; @Schema(description = "板材质", requiredMode = Schema.RequiredMode.REQUIRED) private String material; diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/planitem/PlanItemMapper.xml b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/planitem/PlanItemMapper.xml index b5a7b376f..b47554e29 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/planitem/PlanItemMapper.xml +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/planitem/PlanItemMapper.xml @@ -352,6 +352,7 @@ + @@ -419,7 +420,7 @@ ob.room_name as roomName, ogs.goods_id as plateGoodsId, ogs.goods_name as goodsName, - + ogs.brand as brand, ogs.color as color, ogs.material as material, op.id as plateId, diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/plate/PlateMapper.xml b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/plate/PlateMapper.xml index d5a7dbfa1..e01c1d138 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/plate/PlateMapper.xml +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/plate/PlateMapper.xml @@ -31,6 +31,7 @@ + @@ -391,7 +392,7 @@ ob.room_name as roomName, ogs.goods_id as plateGoodsId, ogs.goods_name as goodsName, - + ogs.brand as brand, ogs.color as color, ogs.material as material, op.id as plateId,