From 49ed3200d1aff4b7d6d8da379e928b453fd214e8 Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Wed, 22 May 2024 00:38:03 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=B5=8B=E8=AF=95=E7=A7=9F?= =?UTF-8?q?=E6=88=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DistributionBusinessPreOrderEntity.java | 15 --------------- .../BusinessPreOrderDataQueueHandler.java | 2 ++ .../IDistributionBusinessPreOrderServiceImpl.java | 10 ++++++++++ 3 files changed, 12 insertions(+), 15 deletions(-) diff --git a/blade-service-api/logpm-business-conversion-api/src/main/java/com/logpm/business/entity/DistributionBusinessPreOrderEntity.java b/blade-service-api/logpm-business-conversion-api/src/main/java/com/logpm/business/entity/DistributionBusinessPreOrderEntity.java index 7197a7e8b..2c134c40b 100644 --- a/blade-service-api/logpm-business-conversion-api/src/main/java/com/logpm/business/entity/DistributionBusinessPreOrderEntity.java +++ b/blade-service-api/logpm-business-conversion-api/src/main/java/com/logpm/business/entity/DistributionBusinessPreOrderEntity.java @@ -104,11 +104,7 @@ public class DistributionBusinessPreOrderEntity extends TenantEntity { @ApiModelProperty(value = "包条码") private String orderPackageCode; - @ApiModelProperty(value = "货区信息") - private String cargoTitle; - @ApiModelProperty(value = "货架信息") - private String shelfTitle; /** * 货位信息 */ @@ -210,18 +206,7 @@ public class DistributionBusinessPreOrderEntity extends TenantEntity { @ApiModelProperty(value = "包件状态") private String orderPackageStatus; - @ApiModelProperty(value = "包件冻结状态") - private String orderPackageFreezeStatus; - @ApiModelProperty(value = "包件冻结状态") - private String orderPackageReservationStatus; - - - @ApiModelProperty(value = "备货状态") - private String orderPackageStockupStatus; - - @ApiModelProperty(value = "上架状态") - private String orderPackageGroundingStatus; @ApiModelProperty(value = "经销商名称") private String dealerName; diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/BusinessPreOrderDataQueueHandler.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/BusinessPreOrderDataQueueHandler.java index e90d436ed..72210a724 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/BusinessPreOrderDataQueueHandler.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/BusinessPreOrderDataQueueHandler.java @@ -145,6 +145,8 @@ public class BusinessPreOrderDataQueueHandler { for (DistributionBusinessPreOrderEntity distributionBusinessPreOrderEntity : list) { for (DistributionBusinessPreOrderEntity businessPreOrderEntity : dataResult) { + businessPreOrderEntity.setTenantId(tenant.getTenantId()); + if (businessPreOrderEntity.getStockArticleId().equals(distributionBusinessPreOrderEntity.getStockArticleId())) { // 找到订单 diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/IDistributionBusinessPreOrderServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/IDistributionBusinessPreOrderServiceImpl.java index 846a015c7..f4b84f0b8 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/IDistributionBusinessPreOrderServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/IDistributionBusinessPreOrderServiceImpl.java @@ -208,6 +208,16 @@ public class IDistributionBusinessPreOrderServiceImpl extends BaseServiceImpl