From f247866769704a6647068b4107ec49828c7314b0 Mon Sep 17 00:00:00 2001 From: liuzhaotian Date: Wed, 22 May 2024 15:23:50 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E7=94=9F=E4=BA=A7=E5=8D=95?= =?UTF-8?q?=E6=BA=90=E6=95=B0=E6=8D=AE-=E4=BC=98=E5=8C=96=E6=97=B6?= =?UTF-8?q?=E7=9A=84=E6=95=B0=E6=8D=AE=E5=8F=82=E6=95=B0=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../plan/vo/OptimizePlateDetialRespVO.java | 8 ++++---- .../optimizeplan/OptimizePlanServiceImpl.java | 8 -------- .../main/resources/mapper/plate/PlateMapper.xml | 17 ++++++++++++----- 3 files changed, 16 insertions(+), 17 deletions(-) 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 814454eb6..29aab6115 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 @@ -8,8 +8,8 @@ import lombok.Data; @Data public class OptimizePlateDetialRespVO { - @Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED) - private Long id; + @Schema(description = "大板ID", requiredMode = Schema.RequiredMode.REQUIRED) + private Long boardId; @Schema(description = "大板名称", requiredMode = Schema.RequiredMode.REQUIRED) private String plateName; @@ -20,8 +20,8 @@ public class OptimizePlateDetialRespVO { @Schema(description = "颜色", requiredMode = Schema.RequiredMode.REQUIRED) private String color; - @Schema(description = "纹路类型，0 正纹 1 可翻转 2 反纹", requiredMode = Schema.RequiredMode.REQUIRED) - private Integer texture; + @Schema(description = "是否有纹路", requiredMode = Schema.RequiredMode.REQUIRED) + private Boolean hasTexture; @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/service/optimizeplan/OptimizePlanServiceImpl.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/optimizeplan/OptimizePlanServiceImpl.java index 41bcccc4e..e3bbca85b 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/optimizeplan/OptimizePlanServiceImpl.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/optimizeplan/OptimizePlanServiceImpl.java @@ -304,10 +304,6 @@ public class OptimizePlanServiceImpl implements OptimizePlanService { OrderSource orderSource = new OrderSource(); List optimizePlateDetialRespVO = plateMapper.selectPlate(orderId); - // 赋值随机ID - for (OptimizePlateDetialRespVO plateDetialRespVO : optimizePlateDetialRespVO) { - plateDetialRespVO.setId(snowflake.nextId()); - } List goodsDOS = goodsMapper.selectList(new LambdaQueryWrapperX() .eq(GoodsDO::getOrderId, orderId) @@ -346,10 +342,6 @@ public class OptimizePlanServiceImpl implements OptimizePlanService { List orderIds = orderItemDOS.stream().map(OrderItemDO::getOrderId).collect(Collectors.toList()); List optimizePlateDetialRespVOS = plateMapper.selectPlateListByOrderIds(orderIds); - // 赋值随机ID - for (OptimizePlateDetialRespVO plateDetialRespVO : optimizePlateDetialRespVOS) { - plateDetialRespVO.setId(snowflake.nextId()); - } List orderDOS = orderMapper.selectBatchIds(orderIds); 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 c6d8d023a..61b35ece7 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 @@ -177,7 +177,8 @@ - + + @@ -192,7 +193,10 @@ select count(distinct og.id) as boardNum, count(distinct op.id) as plateNum, - op.texture as texture, + (case + when p.texture ='' then false + else true end ) as hasTexture, + og.id as boardId, og.goods_name as plateName, og.material as material, og.color as color, @@ -204,7 +208,7 @@ left join plate p on og.goods_id = p.id left join order_remain_plate orp on op.id = orp.plan_id where og.order_id = #{orderId} - group by plateName,material,color,thickness,spec,remainPlateNum,texture; + group by boardId,plateName,material,color,thickness,spec,remainPlateNum,hasTexture; @@ -215,7 +219,10 @@ select count(distinct og.id) as boardNum, count(distinct op.id) as plateNum, - op.texture as texture, + (case + when p.texture ='' then false + else true end ) as hasTexture, + og.id as boardId, og.goods_name as plateName, og.material as material, og.color as color, @@ -232,7 +239,7 @@ #{orderIds} - group by plateName,material,color,thickness,spec,remainPlateNum,texture; + group by boardId,plateName,material,color,thickness,spec,remainPlateNum,hasTexture;