From cb4184fa20e65afd0d7694f904772ce957636b62 Mon Sep 17 00:00:00 2001 From: liuzhaotian Date: Sat, 11 May 2024 11:10:41 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E5=B7=A5=E5=BA=8F?= =?UTF-8?q?=E4=BB=A3=E7=A0=81-=E5=B7=A5=E5=BA=8F=E6=9D=BF=E4=BB=B6?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/plate/PlateController.java | 6 -- .../dal/mysql/orderItem/OrderItemMapper.java | 5 -- .../ProcessStepItemMapper.java | 7 +-- .../executor/service/plate/PlateService.java | 2 - .../service/plate/PlateServiceImpl.java | 19 ------ .../admin/pack/vo/PackPageReqVO.java | 4 +- .../controller/admin/pack/vo/PackRespVO.java | 29 +++++++-- .../process/ProductionProcessController.java | 13 +++- .../admin/process/vo/OrderPlateReqVO.java | 35 +++++++++++ .../admin/process/vo/PlateDetails.java | 28 +++++++++ .../admin/process/vo/ProcessPlateReqVO.java | 31 ++++++++++ .../dal/mysql/pack/OrderPackageMapper.java | 3 +- .../mysql/process/ProcessStepItemMapper.java | 5 +- .../dal/mysql/query/OrderItemMapper.java | 8 +-- .../manage/service/pack/PackServiceImpl.java | 17 ++++-- .../process/ProductionProcessService.java | 4 ++ .../process/ProductionProcessServiceImpl.java | 19 ++++++ .../mysql/process/ProcessStepItemMapper.xml | 39 ++++++++++++ .../dal/mysql/query/OrderItemMapper.xml | 50 ++++++++++++++++ .../mysql/query/ProductionStatusMapper.xml | 59 +++++++++++++++---- 20 files changed, 311 insertions(+), 72 deletions(-) create mode 100644 cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/process/vo/OrderPlateReqVO.java create mode 100644 cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/process/vo/PlateDetails.java create mode 100644 cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/process/vo/ProcessPlateReqVO.java diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plate/PlateController.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plate/PlateController.java index bef744dbd..4f88f226b 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plate/PlateController.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plate/PlateController.java @@ -120,10 +120,4 @@ public class PlateController { } - @GetMapping("/selectPlate") - @Operation(summary = "查看工序对应的板件信息") - public CommonResult > selectPlate(@Valid ProcessPlateReqVO reqVO){ - return success(plateService.selectPlate(reqVO)); - } - } \ 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/dal/mysql/orderItem/OrderItemMapper.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/orderItem/OrderItemMapper.java index b5be6e209..d3b5533c8 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/orderItem/OrderItemMapper.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/orderItem/OrderItemMapper.java @@ -20,10 +20,5 @@ public interface OrderItemMapper extends BaseMapperX { List selectExtraById(@Param("orderId")Long orderId, @Param("roomId")Long roomId , @Param("bodyId")Long bodyId); - default List selectByOrderId(Long orderId) { - return selectList(new LambdaQueryWrapperX() - .eqIfPresent(OrderItemDO::getOrderId,orderId)); - - } } \ 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/dal/mysql/processStepItem/ProcessStepItemMapper.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/processStepItem/ProcessStepItemMapper.java index 70d2c48c2..3921e8bea 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/processStepItem/ProcessStepItemMapper.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/processStepItem/ProcessStepItemMapper.java @@ -3,17 +3,16 @@ package com.cf.imes.module.executor.dal.mysql.processStepItem; import com.cf.imes.framework.mybatis.core.mapper.BaseMapperX; import com.cf.imes.framework.mybatis.core.query.LambdaQueryWrapperX; +import com.cf.imes.module.executor.controller.admin.plate.vo.BodyPlateDetailVO; +import com.cf.imes.module.executor.dal.dataobject.ordermodel.OrderModelDO; import com.cf.imes.module.executor.dal.dataobject.processStepItem.OrderProcessStepItemDO; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; @Mapper public interface ProcessStepItemMapper extends BaseMapperX { - default List selectBodyIds(Long stepItemId) { - return selectList(new LambdaQueryWrapperX() - .eqIfPresent(OrderProcessStepItemDO::getId,stepItemId)); - } } diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plate/PlateService.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plate/PlateService.java index 8135a9eb9..e6ed5dfe0 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plate/PlateService.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plate/PlateService.java @@ -91,6 +91,4 @@ public interface PlateService { List getPlateModelByPlateId(List bodyIds); - // 查看工序对应的板件信息 - List selectPlate(ProcessPlateReqVO reqVO); } \ 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/plate/PlateServiceImpl.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plate/PlateServiceImpl.java index 2d61ce194..56f4bdb63 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plate/PlateServiceImpl.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plate/PlateServiceImpl.java @@ -195,25 +195,6 @@ public class PlateServiceImpl implements PlateService { - // 查看工序对应的板件信息 - @Override - public List selectPlate(ProcessPlateReqVO reqVO) { - - if(reqVO.getProcessType() == 7){ - // 等于 7(组件加工) ，根据明细ID查询对应的柜体ID，再传入方法查询对应的板材信息 - List orderProcessStepItemNDOS = processStepItemMapper.selectBodyIds(reqVO.getStepItemId()); - List bodyIds = orderProcessStepItemNDOS.stream().map(item -> item.getBodyId()).collect(Collectors.toList()); - return getPlateModelByPlateId(bodyIds); - - } - - // 不等于 7(组件加工) ，直接根据订单号查询所有的柜体id，再传入方法查询对应的板材信息 - List orderItemDOS = orderItemMapper.selectByOrderId(reqVO.getOrderId()); - List bodyIds = orderItemDOS.stream().map(item -> item.getBodyId()).collect(Collectors.toList()); - - return getPlateModelByPlateId(bodyIds); - - } private List buildRespByPlateIds(Collection plateIds, String index) { diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/vo/PackPageReqVO.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/vo/PackPageReqVO.java index 98ecd8693..e92a1fd81 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/vo/PackPageReqVO.java +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/vo/PackPageReqVO.java @@ -14,8 +14,8 @@ import lombok.ToString; public class PackPageReqVO extends PageParam { - @Schema(description = "生产状态(2：生产中，4：打包完成,默认生产中)", requiredMode = Schema.RequiredMode.REQUIRED, example = "2") - private Long status; + @Schema(description = "生产状态(已完成，未完成)", requiredMode = Schema.RequiredMode.REQUIRED, example = "2") + private Boolean status; @Schema(description = "订单号") diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/vo/PackRespVO.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/vo/PackRespVO.java index ed9d1cf56..54255639d 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/vo/PackRespVO.java +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/vo/PackRespVO.java @@ -5,8 +5,7 @@ import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import java.time.LocalDateTime; - - +import java.util.List; @Schema(description = "管理后台 - 生产单表 order_{N} Response VO") @@ -18,6 +17,10 @@ public class PackRespVO { private Long id; + @Schema(description = "包裹ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "7788") + private Long packId; + + @Schema(description = "自定义单号", requiredMode = Schema.RequiredMode.REQUIRED,example = "ABCD") private String customOrderNo; @@ -31,7 +34,7 @@ public class PackRespVO { @Schema(description = "订单状态", requiredMode = Schema.RequiredMode.REQUIRED,example = "0") - private Long status; + private Boolean status; @Schema(description = "客户", requiredMode = Schema.RequiredMode.REQUIRED,example = "张三") @@ -59,16 +62,30 @@ public class PackRespVO { - @Schema(description = "已打包数", requiredMode = Schema.RequiredMode.REQUIRED) + + @Schema(description = "已打包数-包裹数", requiredMode = Schema.RequiredMode.REQUIRED) private Long packCount; - @Schema(description = "已打包片数", requiredMode = Schema.RequiredMode.REQUIRED) + @Schema(description = "已打包片数-已处理量", requiredMode = Schema.RequiredMode.REQUIRED) private Long packPieceCount; - @Schema(description = "总片数", requiredMode = Schema.RequiredMode.REQUIRED) + @Schema(description = "总片数-板件总数", requiredMode = Schema.RequiredMode.REQUIRED) private Long totalPieceCount; + + + @Schema(description = "待处理量", requiredMode = Schema.RequiredMode.REQUIRED) + private Long pendingNum; + + +// @Schema(description = "当前包裹的板件数", requiredMode = Schema.RequiredMode.REQUIRED) +// private Long currentPackNum; + + @Schema(description = "生产单对应的板件信息", requiredMode = Schema.RequiredMode.REQUIRED) + List plateDetailsRespVO; + + } diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/process/ProductionProcessController.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/process/ProductionProcessController.java index 8703b14cd..1e70cd346 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/process/ProductionProcessController.java +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/process/ProductionProcessController.java @@ -23,7 +23,7 @@ import java.util.List; import static com.cf.imes.framework.common.pojo.CommonResult.success; -@Tag(name = "管理后台 - 生产单工序 process") +@Tag(name = "管理后台 - 生产单工序") @RestController @RequestMapping("/manage/process") @Validated @@ -75,9 +75,18 @@ public class ProductionProcessController { + @GetMapping("/selectPlate") + @Operation(summary = "查看工序对应的板件信息") + public CommonResult > selectPlate(@Valid ProcessPlateReqVO reqVO){ + return success(productionProcessService.selectPlate(reqVO)); + } + + + + @GetMapping("/selectBodyName") @Operation(summary = "查询生产单对应的柜体名称") - public CommonResult> selectBodyName(OrderBodyReqVO reqVO){ + public CommonResult> selectBodyName(@Valid OrderBodyReqVO reqVO){ return success(productionProcessService.selectBodyName(reqVO)); } diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/process/vo/OrderPlateReqVO.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/process/vo/OrderPlateReqVO.java new file mode 100644 index 000000000..f6372a5d4 --- /dev/null +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/process/vo/OrderPlateReqVO.java @@ -0,0 +1,35 @@ +package com.cf.imes.module.manage.controller.admin.process.vo; + + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.List; + + +@Schema(description = "管理后台 - 查询生产单对应的板件信息 Response VO") +@Data +@NoArgsConstructor +@AllArgsConstructor +public class OrderPlateReqVO { + + +// @Schema(description = "柜体名称") +// private List bodyName; +// +// +// @Schema(description = "柜体ID") +// private List bodyIds; + + + @Schema(description = "柜体ID和名称") + List orderBodyRespVoList; + + + @Schema(description = "板件信息") + List plateDetails; + + +} diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/process/vo/PlateDetails.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/process/vo/PlateDetails.java new file mode 100644 index 000000000..b0a728454 --- /dev/null +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/process/vo/PlateDetails.java @@ -0,0 +1,28 @@ +package com.cf.imes.module.manage.controller.admin.process.vo; + + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +@Data +public class PlateDetails { + + + + @Schema(description = "板编号") + private Long plateId; + + @Schema(description = "板号") + private Long plateNo; + + @Schema(description = "长") + private Long length; + + @Schema(description = "宽") + private Long width; + + @Schema(description = "厚") + private Long thickness; + + +} diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/process/vo/ProcessPlateReqVO.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/process/vo/ProcessPlateReqVO.java new file mode 100644 index 000000000..d2dcd0ce3 --- /dev/null +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/process/vo/ProcessPlateReqVO.java @@ -0,0 +1,31 @@ +package com.cf.imes.module.manage.controller.admin.process.vo; + + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.ToString; + +@Schema(description = "管理后台 - 查询板件") +@Data +@ToString(callSuper = true) +public class ProcessPlateReqVO { + + + @Schema(description = "工序类型",requiredMode = Schema.RequiredMode.REQUIRED) + private Long processType; + + + @Schema(description = "生产单号",requiredMode = Schema.RequiredMode.REQUIRED) + private Long orderId; + + + @Schema(description = "工序明细ID",requiredMode = Schema.RequiredMode.REQUIRED) + private Long stepItemId; + + + @Schema(description = "柜体ID") + private Long bodyId; + + + +} diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/pack/OrderPackageMapper.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/pack/OrderPackageMapper.java index 3c654a9b4..65b09cd55 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/pack/OrderPackageMapper.java +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/pack/OrderPackageMapper.java @@ -1,6 +1,7 @@ package com.cf.imes.module.manage.dal.mysql.pack; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.cf.imes.framework.mybatis.core.mapper.BaseMapperX; import com.cf.imes.framework.mybatis.core.query.LambdaQueryWrapperX; import com.cf.imes.module.manage.controller.admin.pack.vo.OtherPackReqVO; @@ -38,7 +39,7 @@ public interface OrderPackageMapper extends BaseMapperX { - List selectPackPage(@Param("collect") List collect); + List selectPackPage(/*@Param("page") IPage page,*/@Param("collect") List collect); List selectMissingBoard(Long orderNo); diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/process/ProcessStepItemMapper.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/process/ProcessStepItemMapper.java index 027425804..2cb5fbd76 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/process/ProcessStepItemMapper.java +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/process/ProcessStepItemMapper.java @@ -43,9 +43,6 @@ public interface ProcessStepItemMapper extends BaseMapperX selectBodyIds(Long stepItemId) { - return selectList(new LambdaQueryWrapperX() - .eqIfPresent(OrderProcessStepItemNDO::getId,stepItemId)); + List selectBodyIds(@Param("stepItemId") Long stepItemId); - } } diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/query/OrderItemMapper.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/query/OrderItemMapper.java index aee9e28a2..077299f12 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/query/OrderItemMapper.java +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/query/OrderItemMapper.java @@ -6,6 +6,8 @@ import com.cf.imes.framework.mybatis.core.mapper.BaseMapperX; import com.cf.imes.framework.mybatis.core.query.LambdaQueryWrapperX; import com.cf.imes.module.manage.controller.admin.grouping.vo.OrderPlateListRespVO; import com.cf.imes.module.manage.controller.admin.pack.vo.*; +import com.cf.imes.module.manage.controller.admin.process.vo.OrderPlateReqVO; +import com.cf.imes.module.manage.controller.admin.process.vo.ProcessPlateReqVO; import com.cf.imes.module.manage.controller.admin.query.vo.pack.PackageDetailsRespVO; import com.cf.imes.module.manage.controller.admin.query.vo.productionStatus.OrderModuleVO; import com.cf.imes.module.manage.controller.admin.query.vo.productionStatus.OrderPlateRespVO; @@ -76,11 +78,7 @@ public interface OrderItemMapper extends BaseMapperX { - default List selectByOrderId(Long orderId) { - return selectList(new LambdaQueryWrapperX() - .eqIfPresent(OrderItemDO::getOrderId,orderId)); - - } + List selectByOrderId(ProcessPlateReqVO reqVO); OrderPlateDetailsRespVO selectOrderPlateDetails(@Param("orderId") Long orderId); diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/pack/PackServiceImpl.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/pack/PackServiceImpl.java index 318dd6a59..ac0d7e0b2 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/pack/PackServiceImpl.java +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/pack/PackServiceImpl.java @@ -1,6 +1,9 @@ package com.cf.imes.module.manage.service.pack; +import cn.hutool.core.collection.CollectionUtil; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.PageDTO; import com.cf.imes.framework.common.enums.OrderPackageStatusEnum; import com.cf.imes.framework.common.enums.OrderPackageTypeEnum; import com.cf.imes.framework.common.exception.util.ServiceExceptionUtil; @@ -61,28 +64,32 @@ public class PackServiceImpl implements PackService { @Override public PageResult getPackPage(PackPageReqVO pageReqVO) { +// PageDTO page = new PageDTO<>(pageReqVO.getPageNo(), pageReqVO.getPageSize()); + + // 根据生产状态查询生产单号 List collect = productionStatusMapper.selectPackPage(pageReqVO).stream().map(OrderDO::getId).collect(Collectors.toList()); + PageHelper.startPage(pageReqVO.getPageNo(), pageReqVO.getPageSize()); - // 查询包裹的已打包数和已打片数 - List packRespVOS = orderPackageMapper.selectPackPage(collect); + // 查询打包首页分页数据信息，包裹数，板件数量信息 + List packRespVOS = productionStatusMapper.selectOrderPlate(collect); - // 查询打包首页分页数据信息和总片数 - List packRespVOS1 = productionStatusMapper.selectOrderPlate(collect); PageInfo pageInfo = new PageInfo<>(packRespVOS); - pageInfo.setList(packRespVOS1); + // 转换成 PageResult 分页类型 PageResult priceRateReqVOPageResult = PageHelperUtil.convertToPageResult(pageInfo); + return priceRateReqVOPageResult; } + // 查看生产订单对应的包裹信息 @Override public List getOrderPack(PackageDetailsReqVO reqVO) { diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/process/ProductionProcessService.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/process/ProductionProcessService.java index 950e348ab..8e8532a36 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/process/ProductionProcessService.java +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/process/ProductionProcessService.java @@ -31,4 +31,8 @@ public interface ProductionProcessService { // 查询生产单对应的柜体名称 List selectBodyName(OrderBodyReqVO reqVO); + + + List selectPlate(ProcessPlateReqVO reqVO); + } diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/process/ProductionProcessServiceImpl.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/process/ProductionProcessServiceImpl.java index 6eec2de12..d774b36bd 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/process/ProductionProcessServiceImpl.java +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/process/ProductionProcessServiceImpl.java @@ -201,6 +201,25 @@ public class ProductionProcessServiceImpl implements ProductionProcessService { } + + @Override + public List selectPlate(ProcessPlateReqVO reqVO) { + + + if(reqVO.getProcessType() == 7){ + // 等于 7(组件加工) ，根据明细ID查询对应的柜体ID，再传入方法查询对应的板材信息 + List plateDetails = processStepItemMapper.selectBodyIds(reqVO.getStepItemId()); + + return plateDetails; + + } + + // 不等于 7(组件加工) ，直接根据订单号查询所有的柜体id，再传入方法查询对应的板材信息 + return orderItemMapper.selectByOrderId(reqVO); + + } + + } diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/process/ProcessStepItemMapper.xml b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/process/ProcessStepItemMapper.xml index abbae25b6..d5451412f 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/process/ProcessStepItemMapper.xml +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/process/ProcessStepItemMapper.xml @@ -48,6 +48,45 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/query/OrderItemMapper.xml b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/query/OrderItemMapper.xml index 79a5ea77e..ab6d41edc 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/query/OrderItemMapper.xml +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/query/OrderItemMapper.xml @@ -457,4 +457,54 @@ + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/query/ProductionStatusMapper.xml b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/query/ProductionStatusMapper.xml index 080573b3c..8ac5b0fee 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/query/ProductionStatusMapper.xml +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/query/ProductionStatusMapper.xml @@ -45,15 +45,41 @@ - + + + + + - From bba9c7f7bc8aabe6641c91ca2cad79826e71b5bd Mon Sep 17 00:00:00 2001 From: liuzhaotian Date: Sat, 11 May 2024 14:22:45 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E5=B7=A5=E5=BA=8F?= =?UTF-8?q?=E4=BB=A3=E7=A0=81-=E6=89=93=E5=8C=85=E5=88=86=E9=A1=B5?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/admin/pack/PackController.java | 8 +-- .../manage/service/pack/PackServiceImpl.java | 4 -- .../mysql/query/ProductionStatusMapper.xml | 50 ++++++++++++++++++- 3 files changed, 52 insertions(+), 10 deletions(-) diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/PackController.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/PackController.java index 1131756a0..3dc8f17d2 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/PackController.java +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/PackController.java @@ -88,10 +88,10 @@ public class PackController { - @GetMapping("/getOrderPlate") - @Operation(summary = "查看生产订单对应的板材信息") - @Parameter(name = "orderId", description = "生产单Id", required = true) - @PreAuthorize("@ss.hasPermission('manage:pack:query')") +// @GetMapping("/getOrderPlate") +// @Operation(summary = "查看生产订单对应的板材信息") +// @Parameter(name = "orderId", description = "生产单Id", required = true) +// @PreAuthorize("@ss.hasPermission('manage:pack:query')") public CommonResult getOrderPlateList(@Valid @RequestParam("orderId") Long orderId) { return success(packService.getOrderPlateList(orderId)); diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/pack/PackServiceImpl.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/pack/PackServiceImpl.java index ac0d7e0b2..35bd49415 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/pack/PackServiceImpl.java +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/pack/PackServiceImpl.java @@ -66,20 +66,16 @@ public class PackServiceImpl implements PackService { // PageDTO page = new PageDTO<>(pageReqVO.getPageNo(), pageReqVO.getPageSize()); - // 根据生产状态查询生产单号 List collect = productionStatusMapper.selectPackPage(pageReqVO).stream().map(OrderDO::getId).collect(Collectors.toList()); - PageHelper.startPage(pageReqVO.getPageNo(), pageReqVO.getPageSize()); // 查询打包首页分页数据信息，包裹数，板件数量信息 List packRespVOS = productionStatusMapper.selectOrderPlate(collect); - PageInfo pageInfo = new PageInfo<>(packRespVOS); - // 转换成 PageResult 分页类型 PageResult priceRateReqVOPageResult = PageHelperUtil.convertToPageResult(pageInfo); diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/query/ProductionStatusMapper.xml b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/query/ProductionStatusMapper.xml index 8ac5b0fee..2188d304e 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/query/ProductionStatusMapper.xml +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/query/ProductionStatusMapper.xml @@ -50,6 +50,27 @@ + + + + + + + + + + + + + + + + + + + + + From e93ad4d2484af369194b39264e2dbd0d5a7e5885 Mon Sep 17 00:00:00 2001 From: liuzhaotian Date: Sat, 11 May 2024 15:41:20 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E5=B7=A5=E5=BA=8F?= =?UTF-8?q?=E4=BB=A3=E7=A0=81-=E6=89=93=E5=8C=85=E5=88=86=E9=A1=B5?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3=E5=8F=82=E6=95=B0=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../imes/module/executor/service/plate/PlateService.java | 1 + .../controller/admin/pack/vo/PlateDetailsRespVO.java | 7 +++++++ .../manage/dal/mysql/query/ProductionStatusMapper.xml | 6 +++++- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plate/PlateService.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plate/PlateService.java index e6ed5dfe0..c1ce4231d 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plate/PlateService.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plate/PlateService.java @@ -89,6 +89,7 @@ public interface PlateService { */ void updatePlateByRawGoodsId(List createReqVOS); + List getPlateModelByPlateId(List bodyIds); } \ No newline at end of file diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/vo/PlateDetailsRespVO.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/vo/PlateDetailsRespVO.java index da4efebaf..8fe7d227d 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/vo/PlateDetailsRespVO.java +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/vo/PlateDetailsRespVO.java @@ -20,6 +20,13 @@ public class PlateDetailsRespVO { @ExcelProperty("柜体名称") private String cabinetName; + @Schema(description = "房间ID", requiredMode = Schema.RequiredMode.REQUIRED) + private String roomId; + + @Schema(description = "柜体ID", requiredMode = Schema.RequiredMode.REQUIRED) + private String bodyId; + + @Schema(description = "板编号", requiredMode = Schema.RequiredMode.REQUIRED) @ExcelProperty("板编号") private String plateNo; diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/query/ProductionStatusMapper.xml b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/query/ProductionStatusMapper.xml index 2188d304e..45612d5a9 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/query/ProductionStatusMapper.xml +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/query/ProductionStatusMapper.xml @@ -53,6 +53,8 @@ + + @@ -124,6 +126,8 @@ when oi.plate_id !=0 then oi.plate_id end )as plateNum, + ob.room_id as roomId, + ob.id as bodyId, og.name as name, ob.room_name as roomName, ob.name as bodyName, @@ -154,7 +158,7 @@ #{id} - group by orderNo,op.id,oi.package_id,name,roomName,bodyName,plateName,plateMaterial,plateColor,plateHeight,plateWidth,plateThickness,plateArea,texture,remark; + group by orderNo,op.id,oi.package_id,name,roomId,bodyId,roomName,bodyName,plateName,plateMaterial,plateColor,plateHeight,plateWidth,plateThickness,plateArea,texture,remark;