From c3df130e0b608d1da3ac63735f68f1ae16b5f077 Mon Sep 17 00:00:00 2001 From: kilo Date: Sun, 25 Jun 2023 10:59:15 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E7=BA=A6=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basicdata/feign/IBasicdataGoodsAreaClient.java | 2 +- .../entity/DistributionReservationEntity.java | 10 +++++----- .../controller/BasicdataWarehouseController.java | 3 ++- .../controller/DistributionReservationController.java | 1 - .../mapper/DistributionReservationMapper.xml | 2 +- .../impl/DistributionReservationServiceImpl.java | 1 + 6 files changed, 10 insertions(+), 9 deletions(-) diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataGoodsAreaClient.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataGoodsAreaClient.java index 4a0b333f1..388e48ea3 100644 --- a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataGoodsAreaClient.java +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataGoodsAreaClient.java @@ -33,7 +33,7 @@ import org.springframework.web.bind.annotation.RequestParam; ) public interface IBasicdataGoodsAreaClient { - String API_PREFIX = "/client"; + String API_PREFIX = "goodsArea/client"; String TOP = API_PREFIX + "/top"; /** diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionReservationEntity.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionReservationEntity.java index 36486ba95..cac2448ed 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionReservationEntity.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionReservationEntity.java @@ -119,11 +119,11 @@ public class DistributionReservationEntity extends TenantEntity { */ @ApiModelProperty(value = "备注") private String remarks; - /** - * 预约单编号，系统构建生成 - */ - @ApiModelProperty(value = "预约单编号") - private String reservationId; +// /** +// * 预约单编号，系统构建生成 +// */ +// @ApiModelProperty(value = "预约单编号") +// private String reservationId; /** * 时段 */ diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataWarehouseController.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataWarehouseController.java index 89303f9f3..f2186145a 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataWarehouseController.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataWarehouseController.java @@ -30,6 +30,7 @@ import javax.validation.Valid; import org.springblade.core.secure.BladeUser; import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; +import org.springblade.core.secure.utils.AuthUtil; import org.springblade.core.tool.api.R; import org.springframework.web.bind.annotation.*; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -84,6 +85,7 @@ public class BasicdataWarehouseController extends BladeController { qw .apply(startDate != null,"date_format (start_date,'%Y-%m-%d') >= date_format ({0},'%Y-%m-%d')",startDate) .apply(endDate != null,"date_format (end_date,'%Y-%m-%d') <= date_format ({0},'%Y-%m-%d')",endDate); + qw.lambda().eq(BasicdataWarehouseEntity::getTenantId, AuthUtil.getTenantId()); IPage page = warehouseService.page(Condition.getPage(query), qw); // IPage pages = warehouseService.page(Condition.getPage(query), Condition.getQueryWrapper(warehouseWarehouse, BasicdataWarehouseEntity.class)); return R.data(page); @@ -97,7 +99,6 @@ public class BasicdataWarehouseController extends BladeController { @ApiOperation(value = "分页", notes = "传入warehouseWarehouse") public R> listName(String name) { List pages = warehouseService.pageListName(name); - return R.data(pages); } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionReservationController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionReservationController.java index 069c15c9e..d605bafee 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionReservationController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionReservationController.java @@ -100,7 +100,6 @@ public class DistributionReservationController extends BladeController { @ApiOperationSupport(order = 4) @ApiOperation(value = "新增", notes = "传入distrbutionReservation") public R save(@Valid @RequestBody DistributionReservationDTO distributionReservationDTO) { - boolean result = reservationService.insertReservation(distributionReservationDTO); return R.status(result); } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml index c61a98f70..40c283da8 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml @@ -28,7 +28,7 @@ - + diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java index 5e8969b91..37d42f40f 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java @@ -205,6 +205,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl