From e0edb888f318f80f5b92aa2b0e3da6e740c735cd Mon Sep 17 00:00:00 2001 From: caoyizhong <1270296080@qq.com> Date: Sun, 15 Oct 2023 15:17:56 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=9B=98=E7=82=B9=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/logpm/warehouse/entity/QuestDetailEntity.java | 6 ++++++ .../controller/DistributionStockController.java | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/QuestDetailEntity.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/QuestDetailEntity.java index d03ce0a27..241b62bc3 100644 --- a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/QuestDetailEntity.java +++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/QuestDetailEntity.java @@ -132,6 +132,12 @@ public class QuestDetailEntity extends TenantEntity { */ @ApiModelProperty(value = "托盘码") private String trayCode; + + /** + * 上架后的库位ID + */ + @ApiModelProperty(value = "上架后的库位ID") + private String groundingAllocationId; /** * 托盘id */ diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockController.java index 877a9c2fa..3cfa123b5 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockController.java @@ -18,6 +18,7 @@ package com.logpm.distribution.controller; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import com.logpm.distribution.dto.DistributionStockDTO; import com.logpm.distribution.entity.DistributionStockEntity; @@ -108,6 +109,11 @@ public class DistributionStockController extends BladeController { @ApiOperationSupport(order = 4) @ApiOperation(value = "系统备货新增", notes = "传入distributionStock") public R addStockDetail(@Valid @RequestBody DistributionStockDTO distributionStock) { + if(ObjectUtils.isNull(distributionStock.getGoodsAreaId())){ + return R.fail("注意，注意：备货区未选择！"); + } + + return R.status(distributionStockService.addStockDetail(distributionStock)); }