feat(wms): 订单主表和详情表增加含税和无税金额字段

- 在 WmsOrder 和 WmsOrderBo 中添加税含金额和无税金额字段
- 在 WmsOrderDetail 和 WmsOrderDetailBo 中添加含税单价和无税单价字段- 更新对应的 Mapper XML 文件，添加新的字段映射
- 在 WmsOrderVo 和 WmsOrderDetailVo 中添加新字段的 Excel属性注解

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;
+
 }

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;
+
 }

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;
 }

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;
+
 
 }

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;
+
 
 }

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;
+
 
 }

klp-wms/src/main/resources/mapper/klp/WmsOrderDetailMapper.xml

@@ -16,6 +16,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="createBy" column="create_by"/>
         <result property="updateTime" column="update_time"/>
         <result property="updateBy" column="update_by"/>
+        <result property="taxPrice" column="tax_price"/>
+        <result property="noTaxPrice" column="no_tax_price"/>
     </resultMap>
 
     <select id="selectVoListByOrderId" resultType="com.klp.domain.vo.WmsOrderDetailVo">

klp-wms/src/main/resources/mapper/klp/WmsOrderMapper.xml

@@ -17,6 +17,8 @@
         <result property="createBy" column="create_by"/>
         <result property="updateTime" column="update_time"/>
         <result property="updateBy" column="update_by"/>
+        <result property="taxAmount" column="tax_amount"/>
+        <result property="noTaxAmount" column="no_tax_amount"/>
     </resultMap>
 
     <select id="selectVoPlusPage" resultType="com.klp.domain.vo.WmsOrderVo">
@@ -31,6 +33,8 @@
                o.create_by,
                o.update_time,
                o.update_by,
+               o.tax_amount,
+               o.no_tax_amount,
                c.name as customerName
         from wms_order o
         left join wms_customer c on o.customer_id = c.customer_id