出库增加应收款

This commit is contained in:
chuzhichao 2023-05-04 11:10:42 +08:00
parent a4815eae28
commit 0219eeb4ab
4 changed files with 14 additions and 1 deletions

View File

@ -1,5 +1,6 @@
package com.cyl.wms.domain; package com.cyl.wms.domain;
import java.math.BigDecimal;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.annotation.Excel;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
@ -37,6 +38,10 @@ public class ShipmentOrder extends BaseAudit {
@Excel(name = "客户") @Excel(name = "客户")
private Long customerId; private Long customerId;
@ApiModelProperty("应收款合计")
@Excel(name = "应收款合计")
private BigDecimal receivableAmount;
@ApiModelProperty("出库单状态") @ApiModelProperty("出库单状态")
@Excel(name = "出库单状态") @Excel(name = "出库单状态")
private Integer shipmentOrderStatus; private Integer shipmentOrderStatus;

View File

@ -41,6 +41,10 @@ public class ShipmentOrderDetail extends BaseAudit {
@Excel(name = "货架") @Excel(name = "货架")
private Long rackId; private Long rackId;
@ApiModelProperty("金额")
@Excel(name = "金额")
private BigDecimal money;
@ApiModelProperty("删除标识") @ApiModelProperty("删除标识")
private Integer delFlag; private Integer delFlag;

View File

@ -57,6 +57,9 @@ public class ShipmentOrderDetailVO extends BaseAudit {
@Excel(name = "所属仓库") @Excel(name = "所属仓库")
private Long warehouseId; private Long warehouseId;
@Excel(name = "金额")
private BigDecimal money;
@ApiModelProperty("删除标识") @ApiModelProperty("删除标识")
private Integer delFlag; private Integer delFlag;
/** /**

View File

@ -93,6 +93,7 @@
plan_quantity, plan_quantity,
real_quantity, real_quantity,
rack_id, rack_id,
money,
del_flag, del_flag,
remark, remark,
create_by, create_by,
@ -107,7 +108,7 @@
<trim prefix="(" suffix=")" suffixOverrides=","> <trim prefix="(" suffix=")" suffixOverrides=",">
#{item.shipmentOrderId, jdbcType=BIGINT}, #{item.itemId, jdbcType=BIGINT}, #{item.shipmentOrderId, jdbcType=BIGINT}, #{item.itemId, jdbcType=BIGINT},
#{item.planQuantity, jdbcType=DECIMAL}, #{item.realQuantity, jdbcType=DECIMAL}, #{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.createBy, jdbcType=BIGINT}, #{item.createTime, jdbcType=DATE}, #{item.updateBy, jdbcType=BIGINT},
#{item.updateTime, jdbcType=DATE}, #{item.warehouseId, jdbcType=BIGINT}, #{item.updateTime, jdbcType=DATE}, #{item.warehouseId, jdbcType=BIGINT},
#{item.areaId, jdbcType=BIGINT}, #{item.shipmentOrderStatus, jdbcType=TINYINT}, #{item.areaId, jdbcType=BIGINT}, #{item.shipmentOrderStatus, jdbcType=TINYINT},