From eef5db9dc2ec5577d98fdcec51877b13b84842d3 Mon Sep 17 00:00:00 2001 From: JR <3573153686@qq.com> Date: Tue, 12 Aug 2025 16:15:24 +0800 Subject: [PATCH] =?UTF-8?q?feat(wms):=20=E8=AE=A2=E5=8D=95=E4=B8=BB?= =?UTF-8?q?=E8=A1=A8=E5=92=8C=E8=AF=A6=E6=83=85=E8=A1=A8=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=90=AB=E7=A8=8E=E5=92=8C=E6=97=A0=E7=A8=8E=E9=87=91=E9=A2=9D?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在 WmsOrder 和 WmsOrderBo 中添加税含金额和无税金额字段 - 在 WmsOrderDetail 和 WmsOrderDetailBo 中添加含税单价和无税单价字段- 更新对应的 Mapper XML 文件，添加新的字段映射 - 在 WmsOrderVo 和 WmsOrderDetailVo 中添加新字段的 Excel属性注解 --- klp-wms/src/main/java/com/klp/domain/WmsOrder.java | 12 ++++++++++++ .../main/java/com/klp/domain/WmsOrderDetail.java | 10 ++++++++++ .../main/java/com/klp/domain/bo/WmsOrderBo.java | 10 +++++++++- .../java/com/klp/domain/bo/WmsOrderDetailBo.java | 10 ++++++++++ .../java/com/klp/domain/vo/WmsOrderDetailVo.java | 14 ++++++++++++-- .../main/java/com/klp/domain/vo/WmsOrderVo.java | 14 ++++++++++++++ .../resources/mapper/klp/WmsOrderDetailMapper.xml | 4 +++- .../main/resources/mapper/klp/WmsOrderMapper.xml | 4 ++++ 8 files changed, 74 insertions(+), 4 deletions(-) diff --git a/klp-wms/src/main/java/com/klp/domain/WmsOrder.java b/klp-wms/src/main/java/com/klp/domain/WmsOrder.java index c21ab55b..f6a81445 100644 --- a/klp-wms/src/main/java/com/klp/domain/WmsOrder.java +++ b/klp-wms/src/main/java/com/klp/domain/WmsOrder.java @@ -5,6 +5,8 @@ import com.klp.common.core.domain.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; +import java.math.BigDecimal; + /** * 订单主对象 wms_order @@ -54,4 +56,14 @@ public class WmsOrder extends BaseEntity { @TableLogic private Integer delFlag; + /** + * 含税金额 + */ + private BigDecimal taxAmount; + + /** + * 无税金额 + */ + private BigDecimal noTaxAmount; + } diff --git a/klp-wms/src/main/java/com/klp/domain/WmsOrderDetail.java b/klp-wms/src/main/java/com/klp/domain/WmsOrderDetail.java index 5a1623b6..4471fe86 100644 --- a/klp-wms/src/main/java/com/klp/domain/WmsOrderDetail.java +++ b/klp-wms/src/main/java/com/klp/domain/WmsOrderDetail.java @@ -51,4 +51,14 @@ public class WmsOrderDetail extends BaseEntity { @TableLogic private Integer delFlag; + /** + * 含税单价 + */ + private BigDecimal taxPrice; + + /** + * 无税单价 + */ + private BigDecimal noTaxPrice; + } diff --git a/klp-wms/src/main/java/com/klp/domain/bo/WmsOrderBo.java b/klp-wms/src/main/java/com/klp/domain/bo/WmsOrderBo.java index b7aa4126..f24761d3 100644 --- a/klp-wms/src/main/java/com/klp/domain/bo/WmsOrderBo.java +++ b/klp-wms/src/main/java/com/klp/domain/bo/WmsOrderBo.java @@ -3,7 +3,7 @@ package com.klp.domain.bo; import com.klp.common.core.domain.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; -import javax.validation.constraints.*; +import java.math.BigDecimal; /** @@ -52,5 +52,13 @@ public class WmsOrderBo extends BaseEntity { */ private String remark; + /** + * 含税金额 + */ + private BigDecimal taxAmount; + /** + * 无税金额 + */ + private BigDecimal noTaxAmount; } diff --git a/klp-wms/src/main/java/com/klp/domain/bo/WmsOrderDetailBo.java b/klp-wms/src/main/java/com/klp/domain/bo/WmsOrderDetailBo.java index c5e02ea1..bd0c4a9f 100644 --- a/klp-wms/src/main/java/com/klp/domain/bo/WmsOrderDetailBo.java +++ b/klp-wms/src/main/java/com/klp/domain/bo/WmsOrderDetailBo.java @@ -54,5 +54,15 @@ public class WmsOrderDetailBo extends BaseEntity { */ private String remark; + /** + * 含税单价 + */ + private BigDecimal taxPrice; + + /** + * 无税单价 + */ + private BigDecimal noTaxPrice; + } diff --git a/klp-wms/src/main/java/com/klp/domain/vo/WmsOrderDetailVo.java b/klp-wms/src/main/java/com/klp/domain/vo/WmsOrderDetailVo.java index 228347ef..25edff0d 100644 --- a/klp-wms/src/main/java/com/klp/domain/vo/WmsOrderDetailVo.java +++ b/klp-wms/src/main/java/com/klp/domain/vo/WmsOrderDetailVo.java @@ -3,8 +3,6 @@ package com.klp.domain.vo; import java.math.BigDecimal; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; -import com.klp.common.annotation.ExcelDictFormat; -import com.klp.common.convert.ExcelDictConvert; import lombok.Data; @@ -67,5 +65,17 @@ public class WmsOrderDetailVo { @ExcelProperty(value = "产品编码") private String productCode; + /** + * 含税单价 + */ + @ExcelProperty(value = "含税单价") + private BigDecimal taxPrice; + + /** + * 无税单价 + */ + @ExcelProperty(value = "无税单价") + private BigDecimal noTaxPrice; + } diff --git a/klp-wms/src/main/java/com/klp/domain/vo/WmsOrderVo.java b/klp-wms/src/main/java/com/klp/domain/vo/WmsOrderVo.java index 07a84304..b7cb7396 100644 --- a/klp-wms/src/main/java/com/klp/domain/vo/WmsOrderVo.java +++ b/klp-wms/src/main/java/com/klp/domain/vo/WmsOrderVo.java @@ -6,6 +6,8 @@ import com.klp.common.annotation.ExcelDictFormat; import com.klp.common.convert.ExcelDictConvert; import lombok.Data; +import java.math.BigDecimal; + /** * 订单主视图对象 wms_order @@ -62,5 +64,17 @@ public class WmsOrderVo { @ExcelProperty(value = "备注") private String remark; + /** + * 含税金额 + */ + @ExcelProperty(value = "含税金额") + private BigDecimal taxAmount; + + /** + * 无税金额 + */ + @ExcelProperty(value = "无税金额") + private BigDecimal noTaxAmount; + } diff --git a/klp-wms/src/main/resources/mapper/klp/WmsOrderDetailMapper.xml b/klp-wms/src/main/resources/mapper/klp/WmsOrderDetailMapper.xml index 8e27dff8..d07607b0 100644 --- a/klp-wms/src/main/resources/mapper/klp/WmsOrderDetailMapper.xml +++ b/klp-wms/src/main/resources/mapper/klp/WmsOrderDetailMapper.xml @@ -16,6 +16,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + SELECT - d.*, + d.*, p.product_name AS productName, p.product_code AS productCode FROM wms_order_detail d diff --git a/klp-wms/src/main/resources/mapper/klp/WmsOrderMapper.xml b/klp-wms/src/main/resources/mapper/klp/WmsOrderMapper.xml index a2735d5b..4f9793e2 100644 --- a/klp-wms/src/main/resources/mapper/klp/WmsOrderMapper.xml +++ b/klp-wms/src/main/resources/mapper/klp/WmsOrderMapper.xml @@ -17,6 +17,8 @@ + +