From 48e6f36719bf8e6e670d1e9bf33b990fb2a2dbc5 Mon Sep 17 00:00:00 2001 From: liuzhaotian Date: Fri, 17 May 2024 17:45:45 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=8E=92=E5=8D=95-=E7=94=9F?= =?UTF-8?q?=E4=BA=A7=E5=8D=95=E5=85=A8=E9=83=A8=E6=95=B0=E6=8D=AE=E8=BF=94?= =?UTF-8?q?=E5=9B=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/admin/plan/bo/OrderSource.java | 5 +- .../admin/plan/vo/PlateDetialRespVO.java | 93 +++++++++++++++++++ .../executor/dal/mysql/plate/PlateMapper.java | 10 +- .../optimizeplan/OptimizePlanServiceImpl.java | 10 +- .../resources/mapper/plate/PlateMapper.xml | 49 ++++++++++ 5 files changed, 157 insertions(+), 10 deletions(-) create mode 100644 cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/PlateDetialRespVO.java diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/bo/OrderSource.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/bo/OrderSource.java index 34ab6983c..33570e49e 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/bo/OrderSource.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/bo/OrderSource.java @@ -1,6 +1,7 @@ package com.cf.imes.module.executor.controller.admin.plan.bo; import com.cf.imes.module.executor.controller.admin.plan.vo.OptimizeParamRespVO; +import com.cf.imes.module.executor.controller.admin.plan.vo.PlateDetialRespVO; import com.cf.imes.module.executor.controller.admin.plate.vo.PlateDetailVO; import com.cf.imes.module.executor.dal.dataobject.goods.GoodsDO; import com.cf.imes.module.executor.dal.dataobject.order.OrderDO; @@ -34,11 +35,11 @@ public class OrderSource { @Schema(description = "生产单列表") private List orderList; - @Schema(description = "商品板材列表") + @Schema(description = "板材-大板列表") private List goodsList; @Schema(description = "小板列表") - private List plateList; + private List plateList; @Schema(description = "小板造型列表") private List plateModels; 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 new file mode 100644 index 000000000..a1356bb23 --- /dev/null +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/PlateDetialRespVO.java @@ -0,0 +1,93 @@ +package com.cf.imes.module.executor.controller.admin.plan.vo; + + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.math.BigDecimal; + +@Schema(description = "管理后台 - 生产单板件 Response VO") +@Data +public class PlateDetialRespVO { + + @Schema(description = "板件ID", requiredMode = Schema.RequiredMode.REQUIRED) + private Long id; + + @Schema(description = "房间名称", requiredMode = Schema.RequiredMode.REQUIRED) + private String roomName; + + + @Schema(description = "柜体名称", requiredMode = Schema.RequiredMode.REQUIRED) + private String bodyName; + + @Schema(description = "生产单号", requiredMode = Schema.RequiredMode.REQUIRED) + private String orderId; + + @Schema(description = "商品ID", requiredMode = Schema.RequiredMode.REQUIRED) + private Long goodsId; + + + @Schema(description = "板编号", requiredMode = Schema.RequiredMode.REQUIRED) + private String plateNo; + + + @Schema(description = "板名称", requiredMode = Schema.RequiredMode.REQUIRED) + private String name; + + + @Schema(description = "板长", requiredMode = Schema.RequiredMode.REQUIRED) + private Double height; + + @Schema(description = "板宽", requiredMode = Schema.RequiredMode.REQUIRED) + private Double width; + + @Schema(description = "板厚", requiredMode = Schema.RequiredMode.REQUIRED) + private Double thickness; + + @Schema(description = "是否异性-是否弧形地脚，不处理异形", requiredMode = Schema.RequiredMode.REQUIRED) + private Boolean isSpecialShaped; + + @Schema(description = "左封边厚度", requiredMode = Schema.RequiredMode.REQUIRED) + private BigDecimal sealLeft; + + @Schema(description = "右封边厚度", requiredMode = Schema.RequiredMode.REQUIRED) + private BigDecimal sealRight; + + @Schema(description = "上封边厚度", requiredMode = Schema.RequiredMode.REQUIRED) + private BigDecimal sealUp; + + @Schema(description = "下封边厚度", requiredMode = Schema.RequiredMode.REQUIRED) + private BigDecimal sealDown; + + @Schema(description = "纹路类型，0 正纹 1 可翻转 2 反纹", requiredMode = Schema.RequiredMode.REQUIRED) + private Integer texture; + + + @Schema(description = "异型偏移 x", requiredMode = Schema.RequiredMode.REQUIRED) + private Double offsetX; + + @Schema(description = "异型偏移 y", requiredMode = Schema.RequiredMode.REQUIRED) + private Double offsetY; + + + @Schema(description = "备注", requiredMode = Schema.RequiredMode.REQUIRED, example = "你说的对") + private String remark; + + + @Schema(description = "板类型，0 层板 1 立板 2 背板", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") + private Integer type; + + + @Schema(description = "加工组名称", requiredMode = Schema.RequiredMode.REQUIRED) + private String processGroupName; + + @Schema(description = "开门类型，0 无 1 左 2 右 3 上 4 下", requiredMode = Schema.RequiredMode.REQUIRED, example = "2") + private Integer openDoorType; + + + @Schema(description = "生产单明细ID", requiredMode = Schema.RequiredMode.REQUIRED) + private Long itemId; + + + +} diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/plate/PlateMapper.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/plate/PlateMapper.java index dd3ba9b7d..7b413c9be 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/plate/PlateMapper.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/plate/PlateMapper.java @@ -10,10 +10,7 @@ import com.cf.imes.framework.common.pojo.PageResult; import com.cf.imes.framework.common.util.object.BeanUtils; import com.cf.imes.framework.mybatis.core.query.LambdaQueryWrapperX; import com.cf.imes.framework.mybatis.core.mapper.BaseMapperX; -import com.cf.imes.module.executor.controller.admin.plan.vo.PlanSaveReqVO; -import com.cf.imes.module.executor.controller.admin.plan.vo.PlatePage; -import com.cf.imes.module.executor.controller.admin.plan.vo.PlateParam; -import com.cf.imes.module.executor.controller.admin.plan.vo.PlateResList; +import com.cf.imes.module.executor.controller.admin.plan.vo.*; import com.cf.imes.module.executor.dal.dataobject.plate.PlateDO; import org.apache.ibatis.annotations.Mapper; import com.cf.imes.module.executor.controller.admin.plate.vo.*; @@ -94,4 +91,9 @@ public interface PlateMapper extends BaseMapperX { Set selectBatchOrderIdsAndGoodsIds(@Param("itemList") List itemList); PlateDetailRespVO selectPlateNumList(PlateDetailReqVO reqVO); + + List selectPlateDetialList(@Param("orderId") Long orderId); + + + List selectPlateDetialListByIds(@Param("orderIds") Set orderIds); } \ No newline at end of file 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 c9c4a2466..5bbe8b170 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,10 @@ public class OptimizePlanServiceImpl implements OptimizePlanService { List goodsDOS = goodsMapper.selectList(new LambdaQueryWrapperX() .eq(GoodsDO::getOrderId, orderId) ); - List plateDOS = plateMapper.selectList(new LambdaQueryWrapperX() - .eq(PlateDO::getOrderId, orderId) - ); + List plateDOS = plateMapper.selectPlateDetialList(orderId); + List orderModelDOS = buildRespByOrderId(orderId, ORDER_PLATE_MODEL); + orderSource.setOrderList(Collections.singletonList(orderDO)); orderSource.setPlateList(plateDOS); orderSource.setGoodsList(goodsDOS); @@ -333,7 +333,9 @@ public class OptimizePlanServiceImpl implements OptimizePlanService { Set orderIds = orderItemDOS.stream().map(OrderItemDO::getOrderId).collect(Collectors.toSet()); List orderDOS = orderMapper.selectBatchIds(orderIds); List goodsDOS = goodsMapper.selectList(new LambdaQueryWrapperX().in(GoodsDO::getOrderId, orderIds)); - List plateDOS = plateMapper.selectList(new LambdaQueryWrapperX().in(PlateDO::getOrderId, orderIds)); + + List plateDOS = plateMapper.selectPlateDetialListByIds(orderIds); + List orderModelDOS = buildRespByOrderIds(orderIds, ORDER_PLATE_MODEL); return OrderSource.builder() .orderList(orderDOS) 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 2402a5083..84254de21 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 @@ -111,4 +111,53 @@ + + + + + + + + + + + + + + + + \ No newline at end of file