From 53cf9cc23b6036dc75a8be7df911bce0efd26b6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BD=98=E8=8D=A3=E6=99=9F?= <9691125+pan-rongsheng@user.noreply.gitee.com> Date: Fri, 24 Oct 2025 10:30:22 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=AE=A1=E7=90=86=E7=9B=B8?= =?UTF-8?q?=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchaseorder/ErrorCodeConstants.java | 1 + .../vo/PurchaseOrderDetailsRespVO.java | 4 ++++ .../salesorder/vo/SalesOrderPageReqVO.java | 22 +++++++++++++++++++ .../admin/salesorder/vo/SalesOrderRespVO.java | 20 ++++++++++++++++- .../salesorder/vo/SalesOrderSaveReqVO.java | 14 ++++++++++++ .../dataobject/salesorder/SalesOrderDO.java | 10 ++++----- .../mysql/salesorder/SalesOrderMapper.java | 7 +++++- .../salesorder/SalesOrderServiceImpl.java | 8 ++++--- 8 files changed, 76 insertions(+), 10 deletions(-) diff --git a/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/enums/purchaseorder/ErrorCodeConstants.java b/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/enums/purchaseorder/ErrorCodeConstants.java index 24b95d0..bde6a38 100644 --- a/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/enums/purchaseorder/ErrorCodeConstants.java +++ b/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/enums/purchaseorder/ErrorCodeConstants.java @@ -15,4 +15,5 @@ public interface ErrorCodeConstants { ErrorCode ORDER_ID_NOT_EXISTS = new ErrorCode(1_008_000_010, "订单id不能为空"); ErrorCode PRCH_ORD_DTL_NOT_EXISTS = new ErrorCode(1_008_001_001, "采购订单明细不存在"); ErrorCode PURCHASE_ORDER_STATUS_ERROR = new ErrorCode(1_008_001_020, "非法的订单状态"); + ErrorCode Sales_ORDER_NOT_EXISTS = new ErrorCode(1_008_000_001, "销售订单不存在"); } diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/purchaseorder/vo/PurchaseOrderDetailsRespVO.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/purchaseorder/vo/PurchaseOrderDetailsRespVO.java index df04503..37f143c 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/purchaseorder/vo/PurchaseOrderDetailsRespVO.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/purchaseorder/vo/PurchaseOrderDetailsRespVO.java @@ -192,4 +192,8 @@ public class PurchaseOrderDetailsRespVO { */ private List orderDetails; + /** + * 订单类型 + */ + private String splyBsnTp; } diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/salesorder/vo/SalesOrderPageReqVO.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/salesorder/vo/SalesOrderPageReqVO.java index a2b7179..ea6fa5a 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/salesorder/vo/SalesOrderPageReqVO.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/salesorder/vo/SalesOrderPageReqVO.java @@ -1,5 +1,6 @@ package com.zt.plat.module.contractorder.controller.admin.salesorder.vo; +import com.alibaba.excel.annotation.ExcelProperty; import com.zt.plat.framework.common.pojo.PageParam; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -134,4 +135,25 @@ public class SalesOrderPageReqVO extends PageParam { private String splyBsnTp; + @Schema(description = "销售组织名称") + @ExcelProperty("销售组织名称") + private String saleOrgzName; + @Schema(description = "销售组织编码") + @ExcelProperty("销售组织编码") + private String saleOrgzCd; + @Schema(description = "销售部门名称") + @ExcelProperty("销售部门名称") + private String saleAcsName; + @Schema(description = "销售部门编码") + @ExcelProperty("销售部门编码") + private String saleAcsCdg; + + @Schema(description = "产品组名") + @ExcelProperty("产品组名") + private String pdtGrpName; + + @Schema(description = "产品组编码") + @ExcelProperty("产品组编码") + private String pdtGrpCdg; + } diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/salesorder/vo/SalesOrderRespVO.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/salesorder/vo/SalesOrderRespVO.java index 2a4457e..fb28efa 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/salesorder/vo/SalesOrderRespVO.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/salesorder/vo/SalesOrderRespVO.java @@ -191,10 +191,28 @@ public class SalesOrderRespVO { @Schema(description = "流程当前任务节点id") @ExcelProperty("流程当前任务节点id") private String taskId; - @Schema(description = " 审批意见") @ExcelProperty(" 审批意见") private String reviewOpinion; + @Schema(description = "销售组织名称") + @ExcelProperty("销售组织名称") + private String saleOrgzName; + @Schema(description = "销售组织编码") + @ExcelProperty("销售组织编码") + private String saleOrgzCd; + @Schema(description = "分销聚道名称") + @ExcelProperty("分销聚道名称") + private String saleAcsName; + @Schema(description = "分销聚道编码") + @ExcelProperty("分销聚道编码") + private String saleAcsCdg; + + @Schema(description = "产品组名") + @ExcelProperty("产品组名") + private String pdtGrpName; + @Schema(description = "产品组编码") + @ExcelProperty("产品组编码") + private String pdtGrpCdg; } diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/salesorder/vo/SalesOrderSaveReqVO.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/salesorder/vo/SalesOrderSaveReqVO.java index 0d531fb..fea298e 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/salesorder/vo/SalesOrderSaveReqVO.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/salesorder/vo/SalesOrderSaveReqVO.java @@ -186,4 +186,18 @@ public class SalesOrderSaveReqVO { @Schema(description = "销售组织名称", example = "2") @ExcelProperty("销售组织名称") private String saleOrgzName; + + @Schema(description = "销售部门名称") + @ExcelProperty("销售部门名称") + private String saleAcsName; + @Schema(description = "销售部门编码") + @ExcelProperty("销售部门编码") + private String saleAcsCdg; + + @Schema(description = "产品组名") + @ExcelProperty("产品组名") + private String pdtGrpName; + @Schema(description = "产品组编码") + @ExcelProperty("产品组编码") + private String pdtGrpCdg; } diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/dataobject/salesorder/SalesOrderDO.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/dataobject/salesorder/SalesOrderDO.java index 7f4f674..e02e3c1 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/dataobject/salesorder/SalesOrderDO.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/dataobject/salesorder/SalesOrderDO.java @@ -257,25 +257,24 @@ public class SalesOrderDO extends BusinessBaseDO { @TableField("SPLY_BSN_TP") private String splyBsnTp; /** - * 订单子分类 + * 产品组编码 * */ @TableField("PDT_GRP_CDG") private String pdtGrpCdg; /** - * 订单子分类名称 - * + * 产品组名 */ @TableField("PDT_GRP_NAME") private String pdtGrpName; /** - * 销售账户 + * 分销聚道编码 * */ @TableField("SALE_ACS_CDG") private String saleAcsCdg; /** - * 销售账户名称 + * 分销聚道名称 * */ @TableField("SALE_ACS_NAME") @@ -292,4 +291,5 @@ public class SalesOrderDO extends BusinessBaseDO { */ @TableField("SALE_ORGZ_NAME") private String saleOrgzName; + } diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/mysql/salesorder/SalesOrderMapper.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/mysql/salesorder/SalesOrderMapper.java index c2f0b47..b7715e8 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/mysql/salesorder/SalesOrderMapper.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/mysql/salesorder/SalesOrderMapper.java @@ -40,7 +40,12 @@ public interface SalesOrderMapper extends BaseMapperX { .eqIfPresent(SalesOrderDO::getRemark, reqVO.getRemark()) .eqIfPresent(SalesOrderDO::getAgentNumber, reqVO.getAgentNumber()) .likeIfPresent(SalesOrderDO::getAgentName, reqVO.getAgentName()) -// .eqIfPresent(SalesOrderDO::getOrderNumber, reqVO.getOrderNumber()) + .eqIfPresent(SalesOrderDO::getSaleOrgzCd, reqVO.getSaleOrgzCd()) + .likeIfPresent(SalesOrderDO::getSaleOrgzName, reqVO.getSaleOrgzName()) + .likeIfPresent(SalesOrderDO::getSaleAcsName, reqVO.getSaleAcsName()) + .eqIfPresent(SalesOrderDO::getSaleAcsCdg, reqVO.getSaleAcsCdg()) + .likeIfPresent(SalesOrderDO::getPdtGrpName, reqVO.getPdtGrpName()) + .likeIfPresent(SalesOrderDO::getPdtGrpCdg, reqVO.getPdtGrpCdg()) .eqIfPresent(SalesOrderDO::getContractNumber, reqVO.getContractNumber()) .eqIfPresent(SalesOrderDO::getMaterialNumber, reqVO.getMaterialNumber()) .likeIfPresent(SalesOrderDO::getMaterialName, reqVO.getMaterialName()) diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/salesorder/SalesOrderServiceImpl.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/salesorder/SalesOrderServiceImpl.java index 30d24f8..9b449e2 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/salesorder/SalesOrderServiceImpl.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/salesorder/SalesOrderServiceImpl.java @@ -23,6 +23,7 @@ import com.zt.plat.framework.common.util.object.BeanUtils; import static com.zt.plat.framework.common.exception.util.ServiceExceptionUtil.exception; import static com.zt.plat.module.contractorder.enums.purchaseorder.ErrorCodeConstants.PURCHASE_ORDER_NOT_EXISTS; +import static com.zt.plat.module.contractorder.enums.purchaseorder.ErrorCodeConstants.Sales_ORDER_NOT_EXISTS; /** @@ -91,19 +92,20 @@ public class SalesOrderServiceImpl implements SalesOrderService { private void validateSalesOrderExists(List ids) { List list = salesOrderMapper.selectByIds(ids); if (CollUtil.isEmpty(list) || list.size() != ids.size()) { - throw exception(PURCHASE_ORDER_NOT_EXISTS); + throw exception(Sales_ORDER_NOT_EXISTS); } } private void validateSalesOrderExists(Long id) { if (salesOrderMapper.selectById(id) == null) { - throw exception(PURCHASE_ORDER_NOT_EXISTS); + throw exception(Sales_ORDER_NOT_EXISTS); } } @Override public SalesOrderDO getSalesOrder(Long id, String splyBsnTp) { - return salesOrderMapper.selectOne(new LambdaQueryWrapper().eq(SalesOrderDO::getId, id).eq(splyBsnTp != null && !splyBsnTp.isEmpty(), SalesOrderDO::getSplyBsnTp, splyBsnTp)); + return salesOrderMapper.selectOne(new LambdaQueryWrapper().eq(SalesOrderDO::getId, id) + .eq(splyBsnTp != null && !splyBsnTp.isEmpty(), SalesOrderDO::getSplyBsnTp, splyBsnTp)); } @Override