From 786df04d1d612d7e2b26c5f535a27c7accaa4a6f Mon Sep 17 00:00:00 2001 From: liuzhaotian Date: Thu, 11 Jul 2024 15:55:49 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=86=E5=A0=86=E6=89=93=E5=8C=85Bug?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/pack/vo/GroupNameList.java | 16 ++++++++++ .../admin/pack/vo/PlateDetailsRespVO.java | 7 +++++ .../query/vo/pack/PackageDetailsRespVO.java | 6 ++++ .../dal/mysql/query/OrderItemMapper.java | 2 +- .../manage/service/pack/PackServiceImpl.java | 30 ++++++++++++++++++- .../query/ProductionStatusServiceImpl.java | 24 ++++++++++++--- .../dal/mysql/pack/OrderPackageMapper.xml | 3 +- .../dal/mysql/query/OrderItemMapper.xml | 11 +++++-- 8 files changed, 89 insertions(+), 10 deletions(-) create mode 100644 cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/vo/GroupNameList.java diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/vo/GroupNameList.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/vo/GroupNameList.java new file mode 100644 index 000000000..5e8bcb57f --- /dev/null +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/vo/GroupNameList.java @@ -0,0 +1,16 @@ +package com.cf.imes.module.manage.controller.admin.pack.vo; + + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + + + +@Schema(description = "工序组名称") +@Data +public class GroupNameList { + + @Schema(description = "工序组名称") + private String name; + +} 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 9f9c244bb..5aaa1bf49 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 @@ -6,6 +6,10 @@ import com.alibaba.excel.annotation.ExcelProperty; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; +import javax.validation.Valid; +import javax.validation.constraints.NotNull; +import java.util.List; + @Schema(description = "管理后台 - 板材详情(导出板材表) Response VO") @Data @@ -89,4 +93,7 @@ public class PlateDetailsRespVO { private String remark; + @Schema(description = "加工组名称集合") + private List processGroupNameList; + } diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/query/vo/pack/PackageDetailsRespVO.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/query/vo/pack/PackageDetailsRespVO.java index d9837650d..c8efeac34 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/query/vo/pack/PackageDetailsRespVO.java +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/query/vo/pack/PackageDetailsRespVO.java @@ -1,9 +1,12 @@ package com.cf.imes.module.manage.controller.admin.query.vo.pack; +import com.cf.imes.module.manage.controller.admin.pack.vo.GroupNameList; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; +import java.util.List; + @Schema(description = "管理后台 - 包裹详情 Response VO") @Data public class PackageDetailsRespVO { @@ -66,6 +69,9 @@ public class PackageDetailsRespVO { private String remark; + @Schema(description = "加工组名称集合") + private List processGroupNameList; + @Schema(description = "配件名称-配件类型显示", requiredMode = Schema.RequiredMode.REQUIRED) 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 68e36213d..c1008cae2 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 @@ -26,7 +26,7 @@ import java.util.stream.Collectors; public interface OrderItemMapper extends BaseMapperX { - IPage selectByPackageId( @Param("page") IPage page, @Param("packageId") Long packageId, @Param("organId") Long organId); + List selectByPackageId( @Param("packageId") Long packageId, @Param("organId") Long organId); List selectCombinationName(Long orderNo); 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 cfe1aa07d..ff42aeb95 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 @@ -127,6 +127,18 @@ public class PackServiceImpl implements PackService { // 查询订单对应的板件信息 List plateDetailsRespVOS = orderItemMapper.selectOrderPlateList(orderId,getUserOrganId()); + for (PlateDetailsRespVO plateDetailsRespVO : plateDetailsRespVOS) { + String name = ""; + for (GroupNameList groupNameList : plateDetailsRespVO.getProcessGroupNameList()) { + // 去除最后的逗号 + name += groupNameList.getName()+","; + + } + name = name.substring(0, name.length() - 1); + + plateDetailsRespVO.setProcessGroup(name); + } + return plateDetailsRespVOS; @@ -137,7 +149,23 @@ public class PackServiceImpl implements PackService { @Override public List getOrdersPlateList(List orderIds) { - return orderItemMapper.selectOrdersPlateList(orderIds,getUserOrganId()); + + List plateDetailsRespVOS = orderItemMapper.selectOrdersPlateList(orderIds, getUserOrganId()); + + for (PlateDetailsRespVO plateDetailsRespVO : plateDetailsRespVOS) { + String name = ""; + for (GroupNameList groupNameList : plateDetailsRespVO.getProcessGroupNameList()) { + // 去除最后的逗号 + name += groupNameList.getName()+","; + + } + name = name.substring(0, name.length() - 1); + + plateDetailsRespVO.setProcessGroup(name); + } + + return plateDetailsRespVOS; + } diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/query/ProductionStatusServiceImpl.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/query/ProductionStatusServiceImpl.java index 7047dec27..187dc69d7 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/query/ProductionStatusServiceImpl.java +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/query/ProductionStatusServiceImpl.java @@ -3,10 +3,12 @@ package com.cf.imes.module.manage.service.query; import cn.hutool.core.collection.CollectionUtil; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.PageDTO; import com.cf.imes.framework.common.enums.OrderPackageTypeEnum; import com.cf.imes.framework.common.pojo.PageResult; import com.cf.imes.framework.common.util.object.BeanUtils; +import com.cf.imes.module.manage.controller.admin.pack.vo.GroupNameList; import com.cf.imes.module.manage.controller.admin.pack.vo.OrderPartsReqVO; import com.cf.imes.module.manage.controller.admin.pack.vo.PackDetailsReqVO; import com.cf.imes.module.manage.controller.admin.pack.vo.PlateDetailsRespVO; @@ -196,17 +198,31 @@ public class ProductionStatusServiceImpl implements ProductionStatusService { } - // 查看板材包裹 - IPage packageDetailsRespVOS = orderItemMapper.selectByPackageId(page,reqVO.getPackageId(),getUserOrganId()); + List packageDetailsRespVOS = orderItemMapper.selectByPackageId(reqVO.getPackageId(),getUserOrganId()); - if (CollectionUtil.isEmpty(packageDetailsRespVOS.getRecords())) { + for (PackageDetailsRespVO plateDetailsRespVO : packageDetailsRespVOS) { + String name = ""; + for (GroupNameList groupNameList : plateDetailsRespVO.getProcessGroupNameList()) { + // 去除最后的逗号 + name += groupNameList.getName()+","; + + } + name = name.substring(0, name.length() - 1); + + plateDetailsRespVO.setProcessGroup(name); + } + + Page packageDetailsRespVOPage = page.setRecords(packageDetailsRespVOS); + + + if (CollectionUtil.isEmpty(packageDetailsRespVOPage.getRecords())) { return new PageResult<>(); } - return new PageResult<>(packageDetailsRespVOS.getRecords(), packageDetailsRespVOS.getTotal()); + return new PageResult<>(packageDetailsRespVOPage.getRecords(), packageDetailsRespVOPage.getTotal()); } diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/pack/OrderPackageMapper.xml b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/pack/OrderPackageMapper.xml index 385405504..225973df3 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/pack/OrderPackageMapper.xml +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/pack/OrderPackageMapper.xml @@ -100,8 +100,7 @@ op.remark as remark, op.is_special_shaped as specialShaped, op.is_sculpt as profiling, - - CASE WHEN op.front_hole_count = 0 or op.back_model_count = 0 or op.side_hole_count = 0 THEN false ELSE true END AS rowHole + op.is_row_hole AS rowHole from order_plate op join order_goods ogs on op.goods_id = ogs.id and op.organ_id = ogs.organ_id 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 4b2253fc5..d2bc94b42 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 @@ -21,7 +21,10 @@ - + + + + @@ -132,7 +135,11 @@ - + + + + +