diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/OptimizePlateDetialRespVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/OptimizePlateDetialRespVO.java index 5f158e553..06f5036e3 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/OptimizePlateDetialRespVO.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/OptimizePlateDetialRespVO.java @@ -17,8 +17,8 @@ public class OptimizePlateDetialRespVO { @Schema(description = "颜色", requiredMode = Schema.RequiredMode.REQUIRED) private String color; - @Schema(description = "纹路", requiredMode = Schema.RequiredMode.REQUIRED) - private Boolean texture; + @Schema(description = "纹路类型,0 正纹 1 可翻转 2 反纹", requiredMode = Schema.RequiredMode.REQUIRED) + private Integer texture; @Schema(description = "厚度", requiredMode = Schema.RequiredMode.REQUIRED) private Double thickness; diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/PlateDetialRespVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/PlateDetialRespVO.java index 190f35591..5d6781d95 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/PlateDetialRespVO.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/PlateDetialRespVO.java @@ -47,6 +47,16 @@ public class PlateDetialRespVO { @Schema(description = "板厚", requiredMode = Schema.RequiredMode.REQUIRED) private Double thickness; + @Schema(description = "拆单宽度", requiredMode = Schema.RequiredMode.REQUIRED) + private BigDecimal splitWidth; + + @Schema(description = "拆单高度", requiredMode = Schema.RequiredMode.REQUIRED) + private BigDecimal splitHeight; + + @Schema(description = "拆单厚度", requiredMode = Schema.RequiredMode.REQUIRED) + private BigDecimal splitThickness; + + @Schema(description = "是否异性-是否弧形地脚,不处理异形", requiredMode = Schema.RequiredMode.REQUIRED) private Boolean isSpecialShaped; 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 9d71d0397..c6d8d023a 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 @@ -192,8 +192,7 @@ select count(distinct og.id) as boardNum, count(distinct op.id) as plateNum, - (case - when p.texture = null then false else true end ) as texture, + op.texture as texture, og.goods_name as plateName, og.material as material, og.color as color, @@ -216,8 +215,7 @@ select count(distinct og.id) as boardNum, count(distinct op.id) as plateNum, - (case - when p.texture = null then false else true end ) as texture, + op.texture as texture, og.goods_name as plateName, og.material as material, og.color as color,