From f99956fc468c1a67008d9cdb2aaff967a6a86be4 Mon Sep 17 00:00:00 2001 From: "0.0" <1092404103.qq.com> Date: Tue, 29 Aug 2023 17:26:13 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E7=BC=93=E5=AD=98=E5=AE=9E?= =?UTF-8?q?=E4=BD=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../feign/IBasicdataWarehouseClient.java | 4 ++-- .../controller/BasicdataWarehouseController.java | 8 ++++---- .../basicdata/feign/BasicdataWarehouseClient.java | 10 +++++----- .../service/IBasicdataWarehouseService.java | 4 ++-- .../impl/BasicdataGoodsAreaServiceImpl.java | 15 ++++++++------- .../impl/BasicdataGoodsShelfServiceImpl.java | 7 ++++--- .../impl/BasicdataWarehouseServiceImpl.java | 8 ++++---- 7 files changed, 29 insertions(+), 27 deletions(-) diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataWarehouseClient.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataWarehouseClient.java index 88924c1b3..166c160cf 100644 --- a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataWarehouseClient.java +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataWarehouseClient.java @@ -85,7 +85,7 @@ public interface IBasicdataWarehouseClient { * @return */ @GetMapping(API_PREFIX+"/getMyWarehouseList") - List getMyWarehouseList(); + List getMyWarehouseList(); /** * 将当前登录人选择仓库存至缓存 @@ -99,7 +99,7 @@ public interface IBasicdataWarehouseClient { * @return */ @GetMapping(API_PREFIX+"/getMyCurrentWarehouse") - BasicdataWarehouseVO getMyCurrentWarehouse(); + BasicdataWarehouseEntity getMyCurrentWarehouse(); 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 c107b0faf..200083cd2 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 @@ -103,8 +103,8 @@ public class BasicdataWarehouseController extends BladeController { warehouseWarehouse.put("endDate", null); //获取当前登录人仓库 - List myWarehouseList = new ArrayList<>(); - BasicdataWarehouseVO myCurrentWarehouse = basicdataWarehouseClient.getMyCurrentWarehouse(); + List myWarehouseList = new ArrayList<>(); + BasicdataWarehouseEntity myCurrentWarehouse = basicdataWarehouseClient.getMyCurrentWarehouse(); if (Objects.isNull(myCurrentWarehouse)){ myWarehouseList = basicdataWarehouseClient.getMyWarehouseList(); }else {myWarehouseList.add(myCurrentWarehouse);} @@ -254,8 +254,8 @@ public class BasicdataWarehouseController extends BladeController { @GetMapping("/getMyWarehouseList") @ApiOperationSupport(order = 3) @ApiOperation(value = "分页", notes = "传入BasicdataGoodsShelf") - public R> getMyWarehouseList() { - List basicdataGoodsShelfVOList = warehouseService.getMyWarehouseList(); + public R> getMyWarehouseList() { + List basicdataGoodsShelfVOList = warehouseService.getMyWarehouseList(); return R.data(basicdataGoodsShelfVOList); } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataWarehouseClient.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataWarehouseClient.java index ecf0f6231..e794ef1e2 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataWarehouseClient.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataWarehouseClient.java @@ -119,8 +119,8 @@ public class BasicdataWarehouseClient implements IBasicdataWarehouseClient { */ @GetMapping(API_PREFIX+"/getMyWarehouseList") @Override - public List getMyWarehouseList() { - List myWarehouseList = warehouseWarehouseService.getMyWarehouseList(); + public List getMyWarehouseList() { + List myWarehouseList = warehouseWarehouseService.getMyWarehouseList(); return myWarehouseList; } @@ -142,9 +142,9 @@ public class BasicdataWarehouseClient implements IBasicdataWarehouseClient { */ @GetMapping(API_PREFIX+"/getMyCurrentWarehouse") @Override - public BasicdataWarehouseVO getMyCurrentWarehouse() { - BasicdataWarehouseVO myCurrentWarehouse = warehouseWarehouseService.getMyCurrentWarehouse(); - return myCurrentWarehouse; + public BasicdataWarehouseEntity getMyCurrentWarehouse() { + BasicdataWarehouseEntity warehouseEntity = warehouseWarehouseService.getMyCurrentWarehouse(); + return warehouseEntity; } @Override diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataWarehouseService.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataWarehouseService.java index a1e1a06b1..a42b99c97 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataWarehouseService.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataWarehouseService.java @@ -92,7 +92,7 @@ public interface IBasicdataWarehouseService extends BaseService getMyWarehouseList(); + List getMyWarehouseList(); /** * 保存当前用户选择的仓库至Redis缓存中 @@ -103,7 +103,7 @@ public interface IBasicdataWarehouseService extends BaseService getNode() { //查询当前登陆用户能够操作的仓库列表 // BladeUser user = AuthUtil.getUser(); - List myWarehouseList = basicdataWarehouseService.getMyWarehouseList(); + List myWarehouseList = basicdataWarehouseService.getMyWarehouseList(); + ArrayList arrayList = new ArrayList<>(); if (Func.isNotEmpty(myWarehouseList)){ myWarehouseList.forEach(w->{ + BasicdataWarehouseVO basicdataWarehouseVO = new BasicdataWarehouseVO(); + Func.copy(w,basicdataWarehouseVO); LambdaQueryWrapper qw = Wrappers.query().lambda().eq(BasicdataGoodsAreaEntity::getWarehouseId, w.getId()); List basicdataGoodsAreaEntities = basicdataGoodsAreaMapper.selectList(qw); - w.setChildren(basicdataGoodsAreaEntities); + basicdataWarehouseVO.setChildren(basicdataGoodsAreaEntities); + arrayList.add(basicdataWarehouseVO); }); } // //查询一级仓库节点信息 @@ -198,7 +199,7 @@ public class BasicdataGoodsAreaServiceImpl extends BaseServiceImpl goodeAreaNodes = goodsAllocationMapper.selectSecondNode(basicdataNodeVO.getValue()); // basicdataNodeVO.setChildren(goodeAreaNodes); // } - return myWarehouseList; + return arrayList; } @Override diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsShelfServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsShelfServiceImpl.java index f1b8ca49d..fb7768908 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsShelfServiceImpl.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsShelfServiceImpl.java @@ -38,6 +38,7 @@ import com.logpm.basicdata.mapper.BasicdataGoodsShelfMapper; import com.logpm.basicdata.service.IBasicdataGoodsAllocationService; import com.logpm.basicdata.service.IBasicdataGoodsShelfService; import com.logpm.basicdata.vo.BasicdataGoodsShelfVO; +import com.logpm.basicdata.vo.BasicdataWarehouseVO; import com.logpm.warehouse.feign.IWarehouseTrayGoodsClient; import com.logpm.warehouse.feign.IWarehouseUpdownGoodsClient; import lombok.AllArgsConstructor; @@ -132,8 +133,8 @@ public class BasicdataGoodsShelfServiceImpl extends BaseServiceImpl getMyWarehouseList() { + public List getMyWarehouseList() { // 获取当前登陆人 BladeUser user = AuthUtil.getUser(); @@ -174,7 +174,7 @@ public class BasicdataWarehouseServiceImpl extends BaseServiceImpl warehouseEntityList = baseMapper.selectList(Wrappers.query().lambda().in(BasicdataWarehouseEntity::getDepartment, str)); - return BasicdataWarehouseWrapper.build().listVO(warehouseEntityList); + return warehouseEntityList; } @@ -196,10 +196,10 @@ public class BasicdataWarehouseServiceImpl extends BaseServiceImpl