From a7f5f35b44c4c918698deb66a7acd88346f9aaaa Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Fri, 19 Jan 2024 11:24:03 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20=E5=88=9B=E5=BB=BA?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=B2=A1=E6=9C=89=E5=88=9B=E5=BB=BA=E4=BA=BA?= =?UTF-8?q?=E5=92=8C=E5=88=9B=E5=BB=BA=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/DistributionStockArticleEntity.java | 10 +++++----- .../distribution/vo/DistributionStockArticleVO.java | 2 ++ 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockArticleEntity.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockArticleEntity.java index fec559377..44266d556 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockArticleEntity.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockArticleEntity.java @@ -451,16 +451,16 @@ public class DistributionStockArticleEntity extends TenantEntity { @ApiModelProperty(value = "配载件数") private Integer carsLoadNum; /** - * 未入库数量 - */ +/* * 未入库数量 + *//* @TableField(exist = false) private Integer unreceivedQuantity; - /** + *//** * 创建用户id和时间 - */ + *//* @TableField(exist = false) private Long createUser; @TableField(exist = false) @JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd HH:mm:ss") - private Date createTime; + private Date createTime;*/ } diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockArticleVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockArticleVO.java index a3bc07721..38b791adb 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockArticleVO.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockArticleVO.java @@ -159,6 +159,8 @@ public class DistributionStockArticleVO extends DistributionStockArticleEntity { @ApiModelProperty(value = "ids") private List clientIds; + private Integer unreceivedQuantity; + public Map toMap() throws IllegalAccessException {