From 4fef9fb00c0948bf9afd7d857d371160743fa969 Mon Sep 17 00:00:00 2001 From: gaoqr <13665037151@163.com> Date: Thu, 25 Dec 2025 17:53:07 +0800 Subject: [PATCH] =?UTF-8?q?cad=E4=B8=89=E7=BB=B4=E7=9C=8B=E5=9B=BE?= =?UTF-8?q?=E8=83=BD=E5=8A=9B=E7=9B=B8=E5=85=B3=E5=AD=97=E6=AE=B5=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/order/vo/order/OrderBodyViewPlatePageReqVO.java | 3 +++ .../admin/plate/vo/OrderBodyViewPlatePageRespVO.java | 3 +++ .../dal/dataobject/orderItem/OrderBodyViewPlatesPageDO.java | 5 +++++ .../module/executor/dal/mysql/orderItem/OrderItemMapper.java | 1 + .../imes/module/executor/service/plate/PlateServiceImpl.java | 4 ++-- .../src/main/resources/mapper/orderItem/OrderItemMapper.xml | 5 ++++- 6 files changed, 18 insertions(+), 3 deletions(-) diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/vo/order/OrderBodyViewPlatePageReqVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/vo/order/OrderBodyViewPlatePageReqVO.java index 716150008..c37c0036f 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/vo/order/OrderBodyViewPlatePageReqVO.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/vo/order/OrderBodyViewPlatePageReqVO.java @@ -24,4 +24,7 @@ public class OrderBodyViewPlatePageReqVO extends PageParam { @Schema(description = "柜体编号", example = "1024") private Long bodyId; + + @Schema(description = "加工组编号", example = "1024") + private Long groupId; } diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plate/vo/OrderBodyViewPlatePageRespVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plate/vo/OrderBodyViewPlatePageRespVO.java index aa9d74cb2..bf2f63b3c 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plate/vo/OrderBodyViewPlatePageRespVO.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plate/vo/OrderBodyViewPlatePageRespVO.java @@ -22,6 +22,9 @@ import java.math.BigDecimal; @Schema(description = "管理后台 - 柜体对应的板件视图信息") @JsonInclude(JsonInclude.Include.NON_NULL) public class OrderBodyViewPlatePageRespVO { + @Schema(description = "板件id") + private Long id; + @Schema(description = "板件编号") private String plateNo; diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/orderItem/OrderBodyViewPlatesPageDO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/orderItem/OrderBodyViewPlatesPageDO.java index 66ff69450..19565da4c 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/orderItem/OrderBodyViewPlatesPageDO.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/orderItem/OrderBodyViewPlatesPageDO.java @@ -12,6 +12,11 @@ import java.math.BigDecimal; */ @Data public class OrderBodyViewPlatesPageDO { + /** + * 主键 + */ + private Long id; + /** * 板编号 */ 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 7f1edf956..6d37dad3d 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 @@ -200,6 +200,7 @@ public interface OrderItemMapper extends BaseMapperX { @Param("orderId") Long orderId, @Param("roomId") Long roomId, @Param("bodyId") Long bodyId, + @Param("groupId") Long groupId, @Param("organId") Long organId, @Param("cadView") boolean cadView); } \ 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 478b4fc89..3f7eb6a3f 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 @@ -848,7 +848,7 @@ public class PlateServiceImpl implements PlateService { @Override public PageResult getBodyViewPlatesPage(OrderBodyViewPlatePageReqVO pageReqVO) { PageDTO page = new PageDTO<>(pageReqVO.getPageNo(), pageReqVO.getPageSize()); - IPage pageRes = orderItemMapper.selectBodyViewPlatesPage(page, pageReqVO.getOrderId(), pageReqVO.getRoomId(), pageReqVO.getBodyId(), getUserOrganId(), false); + IPage pageRes = orderItemMapper.selectBodyViewPlatesPage(page, pageReqVO.getOrderId(), pageReqVO.getRoomId(), pageReqVO.getBodyId(), pageReqVO.getGroupId(), getUserOrganId(), false); return new PageResult(BeanUtil.copyToList(pageRes.getRecords(), OrderBodyViewPlatePageRespVO.class), pageRes.getTotal()); } @@ -879,7 +879,7 @@ public class PlateServiceImpl implements PlateService { // 查询所有板件的视图所需信息 PageDTO page = new PageDTO<>(1, PageParam.PAGE_SIZE_NONE); - IPage viewPlatesPage = orderItemMapper.selectBodyViewPlatesPage(page, orderItemDO.getOrderId(), orderItemDO.getRoomId(), orderItemDO.getBodyId(), orderItemDO.getOrganId(), true); + IPage viewPlatesPage = orderItemMapper.selectBodyViewPlatesPage(page, orderItemDO.getOrderId(), orderItemDO.getRoomId(), orderItemDO.getBodyId(), null, orderItemDO.getOrganId(), true); List records = viewPlatesPage.getRecords(); List resultList = new ArrayList<>(); diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/orderItem/OrderItemMapper.xml b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/orderItem/OrderItemMapper.xml index 29667e707..1238d5068 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/orderItem/OrderItemMapper.xml +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/orderItem/OrderItemMapper.xml @@ -537,7 +537,7 @@ \ No newline at end of file