From cb910e40e36bd8f183a398f1c0d22938d47f11f6 Mon Sep 17 00:00:00 2001 From: gaoqr <13665037151@163.com> Date: Mon, 29 Dec 2025 15:37:28 +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 --- ...O.java => OrderCadViewPlatePageReqVO.java} | 15 ++++- .../admin/plate/PlateController.java | 10 +-- .../enums/OrderCadViewPlateRangeEnum.java | 33 ++++++++++ .../enums/OrderPlateFilterTypeEnum.java | 32 ---------- .../enums/amount/IncomeExpenseTypeEnum.java | 51 --------------- .../enums/amount/InvoiceStatusEnum.java | 63 ------------------- .../enums/amount/InvoiceTypeEnum.java | 36 ----------- .../executor/enums/amount/IssueTypeEnum.java | 39 ------------ .../executor/enums/amount/TradeTypeEnum.java | 52 --------------- .../executor/service/plate/PlateService.java | 6 +- .../service/plate/PlateServiceImpl.java | 19 ++++-- .../mapper/orderItem/OrderItemMapper.xml | 13 ++-- .../main/resources/message_enum.properties | 2 + .../resources/message_enum_cht.properties | 2 + .../main/resources/message_enum_en.properties | 2 + 15 files changed, 79 insertions(+), 296 deletions(-) rename cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/vo/order/{OrderBodyViewPlatePageReqVO.java => OrderCadViewPlatePageReqVO.java} (56%) create mode 100644 cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/enums/OrderCadViewPlateRangeEnum.java delete mode 100644 cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/enums/OrderPlateFilterTypeEnum.java delete mode 100644 cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/enums/amount/IncomeExpenseTypeEnum.java delete mode 100644 cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/enums/amount/InvoiceStatusEnum.java delete mode 100644 cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/enums/amount/InvoiceTypeEnum.java delete mode 100644 cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/enums/amount/IssueTypeEnum.java delete mode 100644 cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/enums/amount/TradeTypeEnum.java create mode 100644 cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/message_enum.properties create mode 100644 cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/message_enum_cht.properties create mode 100644 cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/message_enum_en.properties 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/OrderCadViewPlatePageReqVO.java similarity index 56% rename from cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/vo/order/OrderBodyViewPlatePageReqVO.java rename to cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/vo/order/OrderCadViewPlatePageReqVO.java index c37c0036f..234cd0ff3 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/OrderCadViewPlatePageReqVO.java @@ -1,20 +1,23 @@ package com.cf.imes.module.executor.controller.admin.order.vo.order; import com.cf.imes.framework.common.pojo.PageParam; +import com.cf.imes.framework.common.validation.InEnum; +import com.cf.imes.module.executor.enums.OrderCadViewPlateRangeEnum; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotNull; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; import lombok.ToString; -@Schema(description = "管理后台 - 柜体视图板材分组条件") +@Schema(description = "管理后台 - WEBCAD视图板材分组条件") @Data @ToString(callSuper = true) @Builder @AllArgsConstructor @NoArgsConstructor -public class OrderBodyViewPlatePageReqVO extends PageParam { +public class OrderCadViewPlatePageReqVO extends PageParam { @Schema(description = "生产单号", example = "1024") private Long orderId; @@ -27,4 +30,12 @@ public class OrderBodyViewPlatePageReqVO extends PageParam { @Schema(description = "加工组编号", example = "1024") private Long groupId; + + @Schema(description = "板件编号", example = "1024") + private Long plateNo; + + @Schema(description = "板件查询范围", example = "1") +// @NotNull(message = "板件查询范围不能为空") + @InEnum(OrderCadViewPlateRangeEnum.class) + private Integer range; } 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 55dea67e2..9d84fed44 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 @@ -6,7 +6,7 @@ import com.cf.imes.framework.common.pojo.PageResult; import com.cf.imes.framework.common.util.object.BeanUtils; import com.cf.imes.framework.excel.core.util.ExcelUtils; import com.cf.imes.framework.operatelog.core.annotations.OperateLog; -import com.cf.imes.module.executor.controller.admin.order.vo.order.OrderBodyViewPlatePageReqVO; +import com.cf.imes.module.executor.controller.admin.order.vo.order.OrderCadViewPlatePageReqVO; import com.cf.imes.module.executor.controller.admin.plan.vo.PlateResList; import com.cf.imes.module.executor.controller.admin.plate.vo.*; import com.cf.imes.module.executor.dal.dataobject.plate.PlateDO; @@ -141,14 +141,14 @@ public class PlateController { @GetMapping("/body/view/page") @Operation(summary = "获取柜体下的板件视图分页列表数据") - public CommonResult> getBodyViewPlatesPage(@Valid OrderBodyViewPlatePageReqVO orderBodyPageRespVO) { - return success(plateService.getBodyViewPlatesPage(orderBodyPageRespVO)); + public CommonResult> getBodyViewPlatesPage(@Valid OrderCadViewPlatePageReqVO orderCadViewPlatePageReqVO) { + return success(plateService.getBodyViewPlatesPage(orderCadViewPlatePageReqVO)); } @GetMapping("/body/view/cadinfo") @Operation(summary = "获取板件对应柜体下的所有板件视图列表数据") @Parameter(name = "plateNo", description = "板件id", required = true) - public CommonResult> getBodyViewPlatesCadInfo(@RequestParam(value = "plateNo") Long plateNo) { - return success(plateService.getBodyViewPlatesCadInfo(plateNo)); + public CommonResult> getBodyViewPlatesCadInfo(@Valid OrderCadViewPlatePageReqVO orderCadViewPlatePageReqVO) { + return success(plateService.getBodyViewPlatesCadInfo(orderCadViewPlatePageReqVO)); } } \ 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/enums/OrderCadViewPlateRangeEnum.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/enums/OrderCadViewPlateRangeEnum.java new file mode 100644 index 000000000..aceb3e6ef --- /dev/null +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/enums/OrderCadViewPlateRangeEnum.java @@ -0,0 +1,33 @@ +package com.cf.imes.module.executor.enums; + +import com.cf.imes.framework.common.core.IntArrayValuable; +import lombok.Getter; +import lombok.RequiredArgsConstructor; + +import java.util.Arrays; + +/** + * cad图纸的板件范围 + * + * @author Gqr + * @since 2025/12/26 9:28 + */ +@RequiredArgsConstructor +@Getter +public enum OrderCadViewPlateRangeEnum implements IntArrayValuable { + BODY(0), + GROUP(1), + GROUP_WITH_BODY(2); + + public static final int[] ARRAYS = Arrays.stream(values()).mapToInt(OrderCadViewPlateRangeEnum::getRange).toArray(); + + @Override + public int[] array() { + return ARRAYS; + } + + /** + * 范围 + */ + private final Integer range; +} diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/enums/OrderPlateFilterTypeEnum.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/enums/OrderPlateFilterTypeEnum.java deleted file mode 100644 index 26bda1b9a..000000000 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/enums/OrderPlateFilterTypeEnum.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.cf.imes.module.executor.enums; - -import lombok.Getter; -import lombok.RequiredArgsConstructor; - -/** - * 生产单板件排单过滤类型 - * - * @author Gqr - * @since 2024/6/7 14:31 - */ -@RequiredArgsConstructor -@Getter -public enum OrderPlateFilterTypeEnum { - HAS_CUT_THROUGH_SHAPE(1, "有挖穿造型"), - - HAS_CUT_PUNCH(2, "有挖穿孔"), - - HAS_2D_KNIFE_PATHS(4, "有二维刀路"), - - STACKABLE(8, "可叠"); - - /** - * 类型编码 - */ - private final Integer code; - - /** - * 描述 - */ - private final String desc; -} diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/enums/amount/IncomeExpenseTypeEnum.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/enums/amount/IncomeExpenseTypeEnum.java deleted file mode 100644 index c1eb98a10..000000000 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/enums/amount/IncomeExpenseTypeEnum.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.cf.imes.module.executor.enums.amount; - - -import cn.hutool.core.util.ObjectUtil; -import lombok.AllArgsConstructor; -import lombok.Getter; - -/** - * @author 交易类型枚举类 - */ - -@Getter -@AllArgsConstructor -public enum IncomeExpenseTypeEnum { - - /** - * 收入 - */ - INCOME(0, "收入"), - /** - * 支出 - */ - EXPENSES(1, "支出"); - - - - /** - * 类型 - */ - private final Integer type; - - /** - * 名称 - */ - private final String name; - - - - public static IncomeExpenseTypeEnum fromType(Integer type) { - if (type == null) { - return null; - } - for (IncomeExpenseTypeEnum value : values()) { - if (ObjectUtil.equal(value.getType(), type)) { - return value; - } - } - return null; - } - -} diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/enums/amount/InvoiceStatusEnum.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/enums/amount/InvoiceStatusEnum.java deleted file mode 100644 index 8afe30fc1..000000000 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/enums/amount/InvoiceStatusEnum.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.cf.imes.module.executor.enums.amount; - - -import cn.hutool.core.util.ObjectUtil; -import lombok.AllArgsConstructor; -import lombok.Getter; - -/** - * @author 发票状态枚举类型 - */ - -@Getter -@AllArgsConstructor -public enum InvoiceStatusEnum { - - - /** - * 可开票 - */ - INVOICABLE(0, "可开票"), - /** - * 待开票 - */ - PENDINGINVOICING(1, "待开票"), - /** - * 已开票 - */ - INVOICINGSUCCESSFUL(2,"已开票"), - /** - * 开票失败 - */ - INVOICINGFAILED(3,"开票失败"); - - - - /** - * 状态 - */ - private final Integer status; - - /** - * 名称 - */ - private final String name; - - - - public static InvoiceStatusEnum fromType(Integer status) { - if (status == null) { - return null; - } - for (InvoiceStatusEnum value : values()) { - if (ObjectUtil.equal(value.getStatus(), status)) { - return value; - } - } - return null; - } - - - - -} diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/enums/amount/InvoiceTypeEnum.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/enums/amount/InvoiceTypeEnum.java deleted file mode 100644 index 6b0bf2a4b..000000000 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/enums/amount/InvoiceTypeEnum.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.cf.imes.module.executor.enums.amount; - - -import lombok.AllArgsConstructor; -import lombok.Getter; - -/** - * @author 发票类型枚举类 - */ -@Getter -@AllArgsConstructor -public enum InvoiceTypeEnum { - - /** - * 增值税普通发票 - */ - INCOME(0, "增值税普通发票"), - /** - * 增值税专用发票 - */ - EXPENSES(1, "增值税专用发票"); - - - - /** - * 类型 - */ - private final Integer type; - - /** - * 名称 - */ - private final String name; - - -} diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/enums/amount/IssueTypeEnum.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/enums/amount/IssueTypeEnum.java deleted file mode 100644 index 5792ce141..000000000 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/enums/amount/IssueTypeEnum.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.cf.imes.module.executor.enums.amount; - - -import lombok.AllArgsConstructor; -import lombok.Getter; - -/** - * @author 发票开具类型枚举类 - */ - -@Getter -@AllArgsConstructor -public enum IssueTypeEnum { - - /** - * 企业 - */ - INCOME(0, "企业"), - /** - * 个人 - */ - EXPENSES(1, "个人"); - - - - /** - * 类型 - */ - private final Integer type; - - /** - * 名称 - */ - private final String name; - - - - -} diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/enums/amount/TradeTypeEnum.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/enums/amount/TradeTypeEnum.java deleted file mode 100644 index b5472a3f9..000000000 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/enums/amount/TradeTypeEnum.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.cf.imes.module.executor.enums.amount; - - -import cn.hutool.core.util.ObjectUtil; -import lombok.AllArgsConstructor; -import lombok.Getter; - -/** - * @author 交易类型枚举类 - */ - -@Getter -@AllArgsConstructor -public enum TradeTypeEnum { - - - /** - * 充值 - */ - INCOME(0, "充值"), - /** - * 软件购买 - */ - EXPENSES(1, "软件购买"); - - - - /** - * 类型 - */ - private final Integer type; - - /** - * 名称 - */ - private final String name; - - - - public static TradeTypeEnum fromType(Integer type) { - if (type == null) { - return null; - } - for (TradeTypeEnum value : values()) { - if (ObjectUtil.equal(value.getType(), type)) { - return value; - } - } - return null; - } - -} 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 9ceda7dfe..e6b3666ef 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 @@ -2,7 +2,7 @@ package com.cf.imes.module.executor.service.plate; import com.cf.imes.framework.common.pojo.PageResult; import com.cf.imes.module.executor.controller.admin.goods.vo.GoodsSaveReqVO; -import com.cf.imes.module.executor.controller.admin.order.vo.order.OrderBodyViewPlatePageReqVO; +import com.cf.imes.module.executor.controller.admin.order.vo.order.OrderCadViewPlatePageReqVO; import com.cf.imes.module.executor.controller.admin.plan.vo.PlateResList; import com.cf.imes.module.executor.controller.admin.plate.vo.*; import com.cf.imes.module.executor.dal.dataobject.plate.PlateDO; @@ -101,7 +101,7 @@ public interface PlateService { * @param orderBodyPageRespVO * @return */ - PageResult getBodyViewPlatesPage(OrderBodyViewPlatePageReqVO orderBodyPageRespVO); + PageResult getBodyViewPlatesPage(OrderCadViewPlatePageReqVO orderBodyPageRespVO); /** * 根据板件id获取柜体下的所有板件cad视图所需信息 @@ -109,5 +109,5 @@ public interface PlateService { * @param plateId * @return */ - List getBodyViewPlatesCadInfo(Long plateId); + List getBodyViewPlatesCadInfo(OrderCadViewPlatePageReqVO orderBodyPageRespVO); } \ 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 3f7eb6a3f..430d202fa 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 @@ -23,7 +23,7 @@ import com.cf.imes.framework.id.core.util.SnowflakeIdWorker3rd; import com.cf.imes.framework.mybatis.core.query.MPJLambdaWrapperX; import com.cf.imes.framework.mybatis.core.query.QueryWrapperX; import com.cf.imes.module.executor.controller.admin.goods.vo.GoodsSaveReqVO; -import com.cf.imes.module.executor.controller.admin.order.vo.order.OrderBodyViewPlatePageReqVO; +import com.cf.imes.module.executor.controller.admin.order.vo.order.OrderCadViewPlatePageReqVO; import com.cf.imes.module.executor.controller.admin.order.vo.order.OrderPlanPlateNumAndAreaRespVO; import com.cf.imes.module.executor.controller.admin.plan.vo.OrderGoodsResp; import com.cf.imes.module.executor.controller.admin.plan.vo.PlateResList; @@ -44,6 +44,7 @@ import com.cf.imes.module.executor.dal.mysql.orderItem.OrderItemMapper; import com.cf.imes.module.executor.dal.mysql.plan.PlanMapper; import com.cf.imes.module.executor.dal.mysql.plate.PlateGoodMapper; import com.cf.imes.module.executor.dal.mysql.plate.PlateMapper; +import com.cf.imes.module.executor.enums.OrderCadViewPlateRangeEnum; import com.cf.imes.module.executor.enums.OrderItemType; import com.cf.imes.module.executor.enums.OrderStatusEnum; import com.cf.imes.module.executor.service.order.OrderInputProcessor; @@ -846,14 +847,15 @@ public class PlateServiceImpl implements PlateService { } @Override - public PageResult getBodyViewPlatesPage(OrderBodyViewPlatePageReqVO pageReqVO) { + public PageResult getBodyViewPlatesPage(OrderCadViewPlatePageReqVO pageReqVO) { PageDTO page = new PageDTO<>(pageReqVO.getPageNo(), pageReqVO.getPageSize()); 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()); } @Override - public List getBodyViewPlatesCadInfo(Long plateId) { + public List getBodyViewPlatesCadInfo(OrderCadViewPlatePageReqVO reqVO) { + Long plateId = reqVO.getPlateNo(); // 匹配板材 PlateDO plateDO = plateMapper.selectById(plateId); if (ObjectUtil.isNull(plateDO)) { @@ -879,7 +881,16 @@ 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(), null, orderItemDO.getOrganId(), true); + IPage viewPlatesPage; + + Integer range = reqVO.getRange(); + if (OrderCadViewPlateRangeEnum.GROUP.getRange().equals(range)) { + viewPlatesPage = orderItemMapper.selectBodyViewPlatesPage(page, orderItemDO.getOrderId(), orderItemDO.getRoomId(), orderItemDO.getBodyId(), orderItemDO.getGroupId(), orderItemDO.getOrganId(), true); + } else if (OrderCadViewPlateRangeEnum.GROUP_WITH_BODY.getRange().equals(range)) { + viewPlatesPage = orderItemMapper.selectBodyViewPlatesPage(page, orderItemDO.getOrderId(), orderItemDO.getRoomId(), orderItemDO.getBodyId(), orderItemDO.getGroupId(), orderItemDO.getOrganId(), true); + } else { + 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 64b8aed7f..f2b8f332f 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 @@ -535,15 +535,10 @@