From 4a259b0bd370719435c64c0f94fad6db7ece4ff8 Mon Sep 17 00:00:00 2001 From: kilo Date: Thu, 17 Aug 2023 11:49:12 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B8=82=E9=85=8D=E9=85=8D=E9=80=81=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E7=BC=96=E8=BE=91=E3=80=81=E9=85=8D=E9=80=81=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E5=A2=9E=E5=8A=A0=E4=BB=BB=E5=8A=A1=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DistributionDeliveryListEntity.java | 2 +- .../BasicdataWarehouseController.java | 28 ++++++++++++++++++- .../impl/BasicdataWarehouseServiceImpl.java | 3 ++ .../DistributionDeliveryListController.java | 7 ++--- .../DistributionDeliveryAllocationDTO.java | 2 +- .../DistributionDeliveryListServiceImpl.java | 7 +++-- .../DistributionReservationServiceImpl.java | 7 +++-- 7 files changed, 42 insertions(+), 14 deletions(-) diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionDeliveryListEntity.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionDeliveryListEntity.java index a11ae7108..579735998 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionDeliveryListEntity.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionDeliveryListEntity.java @@ -225,7 +225,7 @@ public class DistributionDeliveryListEntity extends TenantEntity { * 配车时间 */ @ApiModelProperty(value = "配车时间") - private String taskTime; + private Date taskTime; /** * 配送单号 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 204a93acf..27aa00906 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 @@ -57,7 +57,8 @@ import javax.servlet.http.HttpServletResponse; @AllArgsConstructor @RequestMapping("/warehouse") @Api(value = "仓库", tags = "仓库接口") -public class BasicdataWarehouseController extends BladeController { +public class +BasicdataWarehouseController extends BladeController { private final IBasicdataWarehouseService warehouseService; @@ -242,4 +243,29 @@ public class BasicdataWarehouseController extends BladeController { return R.data(basicdataGoodsShelfVOList); } + + + + + /* + 1. 得到仓库列表 + 根据当前登录人 + 当前人部门 + 情况 + 1、登录人部门范围大 登录人 -- 仓库 -> 一对多 + 递归查询 + 2、登录人部门就是营业部节点 登录人 -- 仓库 -> 一对一 + + 2、存放用户选择的仓库id + key 租户Id + 用户id + + + 3、Feign 获取用户选择的仓库 + 这里考虑两种情况 + 1、用户只有一个仓库信息，直接返回 + 2、用户没有选择仓库的动作，返回null + + + */ + } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataWarehouseServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataWarehouseServiceImpl.java index 13b6fcf35..0eeca9eec 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataWarehouseServiceImpl.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataWarehouseServiceImpl.java @@ -26,6 +26,7 @@ import com.logpm.basicdata.mapper.BasicdataWarehouseMapper; import com.logpm.basicdata.service.IBasicdataWarehouseService; import com.logpm.basicdata.vo.BasicdataWarehouseVO; import lombok.AllArgsConstructor; +import org.springblade.core.secure.BladeUser; import org.springblade.core.secure.utils.AuthUtil; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.Func; @@ -127,6 +128,8 @@ public class BasicdataWarehouseServiceImpl extends BaseServiceImpl getMyWarehouseList() { // 获取当前登陆人 + BladeUser user = AuthUtil.getUser(); + String deptId = user.getDeptId(); // 获取当前登陆人能操作的仓库列表 diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionDeliveryListController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionDeliveryListController.java index bd26f83b9..d5d0db45b 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionDeliveryListController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionDeliveryListController.java @@ -319,9 +319,9 @@ public class DistributionDeliveryListController extends BladeController { /** - * 修改配送任务 + * 修改市配配送计划 */ - @PutMapping("/updateMarketDeliveryList") + @PutMapping("/updateMarketDelivery") @ApiOperationSupport(order = 2) @ApiOperation(value = "分页", notes = "customArgs") public R updateMarketDeliveryList(@RequestBody DistributionDeliveryListDTO deliveryListDTO) { @@ -329,7 +329,4 @@ public class DistributionDeliveryListController extends BladeController { return result; } - - - } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionDeliveryAllocationDTO.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionDeliveryAllocationDTO.java index 1d2649e75..c0dee23e3 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionDeliveryAllocationDTO.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionDeliveryAllocationDTO.java @@ -80,7 +80,7 @@ public class DistributionDeliveryAllocationDTO { * 任务时间 */ @ApiModelProperty(value = "任务时间") - private String taskTime; + private Date taskTime; } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java index aa4f6aecb..3216fe42f 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java @@ -1297,6 +1297,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl 1) { // distributionDeliveryListEntity.setOrderId(orderIds.deleteCharAt(orderIds.length() - 1).toString()); // } @@ -1248,16 +1250,15 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl