From 0219eeb4ab653066c50c4821e49fdd967d8f0023 Mon Sep 17 00:00:00 2001 From: chuzhichao Date: Thu, 4 May 2023 11:10:42 +0800 Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E5=BA=93=E5=A2=9E=E5=8A=A0=E5=BA=94?= =?UTF-8?q?=E6=94=B6=E6=AC=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- wms/src/main/java/com/cyl/wms/domain/ShipmentOrder.java | 5 +++++ .../main/java/com/cyl/wms/domain/ShipmentOrderDetail.java | 4 ++++ .../main/java/com/cyl/wms/pojo/vo/ShipmentOrderDetailVO.java | 3 +++ wms/src/main/resources/mapper/ShipmentOrderDetailMapper.xml | 3 ++- 4 files changed, 14 insertions(+), 1 deletion(-) diff --git a/wms/src/main/java/com/cyl/wms/domain/ShipmentOrder.java b/wms/src/main/java/com/cyl/wms/domain/ShipmentOrder.java index 99a2b1e..2be01a2 100644 --- a/wms/src/main/java/com/cyl/wms/domain/ShipmentOrder.java +++ b/wms/src/main/java/com/cyl/wms/domain/ShipmentOrder.java @@ -1,5 +1,6 @@ package com.cyl.wms.domain; +import java.math.BigDecimal; import java.time.LocalDateTime; import com.ruoyi.common.annotation.Excel; import io.swagger.annotations.ApiModel; @@ -37,6 +38,10 @@ public class ShipmentOrder extends BaseAudit { @Excel(name = "客户") private Long customerId; + @ApiModelProperty("应收款合计") + @Excel(name = "应收款合计") + private BigDecimal receivableAmount; + @ApiModelProperty("出库单状态") @Excel(name = "出库单状态") private Integer shipmentOrderStatus; diff --git a/wms/src/main/java/com/cyl/wms/domain/ShipmentOrderDetail.java b/wms/src/main/java/com/cyl/wms/domain/ShipmentOrderDetail.java index f07d753..183d845 100644 --- a/wms/src/main/java/com/cyl/wms/domain/ShipmentOrderDetail.java +++ b/wms/src/main/java/com/cyl/wms/domain/ShipmentOrderDetail.java @@ -41,6 +41,10 @@ public class ShipmentOrderDetail extends BaseAudit { @Excel(name = "货架") private Long rackId; + @ApiModelProperty("金额") + @Excel(name = "金额") + private BigDecimal money; + @ApiModelProperty("删除标识") private Integer delFlag; diff --git a/wms/src/main/java/com/cyl/wms/pojo/vo/ShipmentOrderDetailVO.java b/wms/src/main/java/com/cyl/wms/pojo/vo/ShipmentOrderDetailVO.java index 139205a..e166914 100644 --- a/wms/src/main/java/com/cyl/wms/pojo/vo/ShipmentOrderDetailVO.java +++ b/wms/src/main/java/com/cyl/wms/pojo/vo/ShipmentOrderDetailVO.java @@ -57,6 +57,9 @@ public class ShipmentOrderDetailVO extends BaseAudit { @Excel(name = "所属仓库") private Long warehouseId; + @Excel(name = "金额") + private BigDecimal money; + @ApiModelProperty("删除标识") private Integer delFlag; /** diff --git a/wms/src/main/resources/mapper/ShipmentOrderDetailMapper.xml b/wms/src/main/resources/mapper/ShipmentOrderDetailMapper.xml index 3b0b27e..3181a13 100644 --- a/wms/src/main/resources/mapper/ShipmentOrderDetailMapper.xml +++ b/wms/src/main/resources/mapper/ShipmentOrderDetailMapper.xml @@ -93,6 +93,7 @@ plan_quantity, real_quantity, rack_id, + money, del_flag, remark, create_by, @@ -107,7 +108,7 @@ #{item.shipmentOrderId, jdbcType=BIGINT}, #{item.itemId, jdbcType=BIGINT}, #{item.planQuantity, jdbcType=DECIMAL}, #{item.realQuantity, jdbcType=DECIMAL}, - #{item.rackId, jdbcType=BIGINT}, #{item.delFlag, jdbcType=TINYINT}, #{item.remark, jdbcType=VARCHAR}, + #{item.rackId, jdbcType=BIGINT},#{item.money, jdbcType=DECIMAL}, #{item.delFlag, jdbcType=TINYINT}, #{item.remark, jdbcType=VARCHAR}, #{item.createBy, jdbcType=BIGINT}, #{item.createTime, jdbcType=DATE}, #{item.updateBy, jdbcType=BIGINT}, #{item.updateTime, jdbcType=DATE}, #{item.warehouseId, jdbcType=BIGINT}, #{item.areaId, jdbcType=BIGINT}, #{item.shipmentOrderStatus, jdbcType=TINYINT},