From 3c4a4a4650adb3db8c2706c7e93300e43126234d Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Mon, 17 Jun 2024 14:43:46 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=87=E8=B4=A7BUG=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../distribution/entity/DistributionParcelListEntity.java | 7 +++++++ .../appcontroller/DistributionStockupAppController.java | 3 ++- .../service/impl/DistributionSignforServiceImpl.java | 2 ++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionParcelListEntity.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionParcelListEntity.java index e94deb6ee..673a3e634 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionParcelListEntity.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionParcelListEntity.java @@ -205,6 +205,13 @@ public class DistributionParcelListEntity extends TenantEntity { @TableField(exist = false) private Long marketId; + /** + * 商场id + */ + @ApiModelProperty(value = "商场id") + @TableField(exist = false) + private Long mallId; + /** * 商场名称 */ diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionStockupAppController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionStockupAppController.java index 6e68be66d..9cc77a437 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionStockupAppController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionStockupAppController.java @@ -1486,6 +1486,7 @@ public class DistributionStockupAppController extends BladeController { warehouseUpdownStockUpAreaClient.upStockUpShelf(jsonObject); entity.setStockupAreaId(stockupDTO.getStockupAllocationId()); } + entity.setTenantId(AuthUtil.getTenantId()); distributionStockService.save(entity); //这里尝试修改备货库存品包件的备货状态 boolean update = distributionParcelListService.update(Wrappers.update().lambda() @@ -1493,7 +1494,7 @@ public class DistributionStockupAppController extends BladeController { .eq(DistributionParcelListEntity::getWarehouseId, myCurrentWarehouse.getId()) .eq(DistributionParcelListEntity::getConditions, "2") .eq(DistributionParcelListEntity::getMaterialId, entity.getMaterialId()) - .eq(DistributionParcelListEntity::getMarketId, entity.getMarketId()) + .eq(entity.getStockArticle() != null,DistributionParcelListEntity::getStockArticleId, entity.getStockArticle()) .set(DistributionParcelListEntity::getOrderPackageStockupStatus, OrderPackageStockupStatusConstant.yibeihu.getValue()) ); diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java index 157c194b4..feecdd5c7 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java @@ -2544,6 +2544,8 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl