From fdbf606e35abe7efef6552d4b932a5233de20fd8 Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Wed, 13 Nov 2024 17:50:19 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E5=A2=9E=E5=8A=A0=E6=89=98=E7=9B=98?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E7=9A=84=E4=B8=B2=E8=B4=A7=E6=A0=87=E8=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/WarehouseParcelListEntity.java | 30 +------------------ .../basicdata/vo/WarehouseParcelListVO.java | 7 +++++ .../basicdata/mapper/BasicdataTrayMapper.xml | 4 ++- 3 files changed, 11 insertions(+), 30 deletions(-) diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/WarehouseParcelListEntity.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/WarehouseParcelListEntity.java index 50990de2f..5d591103f 100644 --- a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/WarehouseParcelListEntity.java +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/WarehouseParcelListEntity.java @@ -46,36 +46,8 @@ import java.util.Date; * @since 2023-06-13 */ @Data -@TableName("logpm_warehouse_parcel_list") -@ApiModel(value = "WarehouseParcelList对象", description = "在库订单包件清单") -@EqualsAndHashCode(callSuper = true) -public class WarehouseParcelListEntity extends TenantEntity { +public class WarehouseParcelListEntity { - /** - * 预留1 - */ - @ApiModelProperty(value = "预留1") - private String reserve1; - /** - * 预留2 - */ - @ApiModelProperty(value = "预留2") - private String reserve2; - /** - * 预留3 - */ - @ApiModelProperty(value = "预留3") - private String reserve3; - /** - * 预留4 - */ - @ApiModelProperty(value = "预留4") - private String reserve4; - /** - * 预留5 - */ - @ApiModelProperty(value = "预留5") - private String reserve5; /** * 订单自编号 */ diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/WarehouseParcelListVO.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/WarehouseParcelListVO.java index dda7100a1..9e25450bf 100644 --- a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/WarehouseParcelListVO.java +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/WarehouseParcelListVO.java @@ -104,4 +104,11 @@ public class WarehouseParcelListVO extends WarehouseParcelListEntity { */ private String positionCode; + + /** + * 是否窜货 0否 1是 + */ + private Integer isFleeing; + + } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataTrayMapper.xml b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataTrayMapper.xml index 6053b60ab..dfc066552 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataTrayMapper.xml +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataTrayMapper.xml @@ -116,7 +116,9 @@ lwga.column_num columnNum, lwga.layer_num layerNum, lwtg.create_time operateTime, - lwtg.create_user operateUser + lwtg.create_user operateUser, + lwtg.is_fleeing isFleeing + FROM logpm_warehouse_tray_goods lwtg JOIN logpm_distribution_parcel_list ldpl ON lwtg.association_id = ldpl.id