From 68bc800846e2e3e9cad2a52d99c1c86418fb89fb Mon Sep 17 00:00:00 2001 From: "0.0" <1092404103.qq.com> Date: Mon, 21 Aug 2023 20:58:55 +0800 Subject: [PATCH] =?UTF-8?q?1.=E7=BB=9F=E8=AE=A1=E6=95=B0=E9=87=8F=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E7=BC=93=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../warehouse/vo/WarehouseCargoSumVO.java | 28 +++++++++++ .../logpm/warehouse/vo/WarehouseTrayVO.java | 5 ++ .../vo/WarehouseVisualizationVO.java | 15 ++++++ .../BasicdataStorageServicesServiceImpl.java | 3 +- .../impl/BasicdataTrayServiceImpl.java | 8 +++- .../WarehouseGoodsAllocationController.java | 41 +++++++++++++++-- .../WarehouseGoodsAllocationMapper.java | 6 +++ .../mapper/WarehouseGoodsAllocationMapper.xml | 32 +++++++++++-- .../IWarehouseGoodsAllocationService.java | 6 ++- .../WarehouseGoodsAllocationServiceImpl.java | 46 ++++++++++++++++++- 10 files changed, 176 insertions(+), 14 deletions(-) create mode 100644 blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/WarehouseCargoSumVO.java diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/WarehouseCargoSumVO.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/WarehouseCargoSumVO.java new file mode 100644 index 000000000..00594b612 --- /dev/null +++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/WarehouseCargoSumVO.java @@ -0,0 +1,28 @@ +package com.logpm.warehouse.vo; + +import lombok.Data; + +@Data +public class WarehouseCargoSumVO { + + /** + * 货区id + */ + private Long id; + /** + * 总货位 + */ + private Integer cargoNub; + /** + * 使用货位 + */ + private Integer employNub; + /** + * 可用货位 + */ + private Integer unusedNub; + /** + * 禁用货位 + */ + private Integer disableNub; +} diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/WarehouseTrayVO.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/WarehouseTrayVO.java index 9f535ef94..cae531074 100644 --- a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/WarehouseTrayVO.java +++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/WarehouseTrayVO.java @@ -64,6 +64,11 @@ public class WarehouseTrayVO extends WarehouseTrayEntity { */ @ApiModelProperty(value = "托盘货物录入类型(name)") private String palletizingTypeName; + /** + * 托盘状态(name) + */ + @ApiModelProperty(value = "托盘状态(name)") + private String trayStatusName; /** * 数量 */ diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/WarehouseVisualizationVO.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/WarehouseVisualizationVO.java index 213ff81ab..700d7f915 100644 --- a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/WarehouseVisualizationVO.java +++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/WarehouseVisualizationVO.java @@ -47,6 +47,21 @@ public class WarehouseVisualizationVO extends WarehouseParcelListcopyEntity { */ @ApiModelProperty(value = "打托方式") private String updownType; + /** + * 客户姓名 + */ + @ApiModelProperty(value = "客户姓名") + private String customerName; + /** + * 客户电话 + */ + @ApiModelProperty(value = "客户电话") + private String customerTelephone; + /** + * 客户地址 + */ + @ApiModelProperty(value = "客户地址") + private String customerAddress; diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataStorageServicesServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataStorageServicesServiceImpl.java index 3b49b6be0..676e2e32d 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataStorageServicesServiceImpl.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataStorageServicesServiceImpl.java @@ -23,6 +23,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.logpm.basicdata.dto.BasicdataStorageServicesDTO; import com.logpm.basicdata.entity.BasicdataStorageServicesEntity; import com.logpm.basicdata.entity.BasicdataWarehouseEntity; +import com.logpm.basicdata.feign.IBasicdataWarehouseClient; import com.logpm.basicdata.service.IBasicdataWarehouseService; import com.logpm.basicdata.vo.BasicdataStorageServicesVO; import com.logpm.basicdata.excel.BasicdataStorageServicesExcel; @@ -101,7 +102,7 @@ public class BasicdataStorageServicesServiceImpl extends BaseServiceImpl userR = userClient.userInfoByIdOwn(user.getUserId()); + // R userR = userClient.userInfoByIdOwn(user.getUserId()); QueryWrapper queryWrapper = new QueryWrapper(); queryWrapper.eq("tenant_id",user.getTenantId()); /*if(userR.getData().getRoleName().equals("管理员")){ diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataTrayServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataTrayServiceImpl.java index 06aaa486f..aee7c9856 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataTrayServiceImpl.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataTrayServiceImpl.java @@ -32,9 +32,11 @@ import com.logpm.basicdata.feign.BasicdataCodeClient; import com.logpm.basicdata.feign.IBasicdataCodeClient; import com.logpm.basicdata.feign.IBasicdataCodeClient; +import com.logpm.basicdata.feign.IBasicdataWarehouseClient; import com.logpm.basicdata.mapper.BasicdataTrayMapper; import com.logpm.basicdata.mapper.BasicdataWarehouseMapper; import com.logpm.basicdata.service.IBasicdataTrayService; +import com.logpm.basicdata.service.IBasicdataWarehouseService; import com.logpm.basicdata.vo.BasicdataTrayVO; import com.logpm.basicdata.vo.BasicdataStockArticleVO; import com.logpm.basicdata.vo.WarehouseParcelListVO; @@ -93,10 +95,13 @@ public class BasicdataTrayServiceImpl extends BaseServiceImpl selectBasicdataTrayPage(IPage page, BasicdataTrayVO BasicdataTray) { + return page.setRecords(baseMapper.selectBasicdataTrayPage(page, BasicdataTray)); } @@ -128,7 +133,7 @@ public class BasicdataTrayServiceImpl extends BaseServiceImpl>> Visualization(WarehouseGoodsAllocationVO warehouseGoodsAllocation) { +// if (null !=bladeRedis.get(Url+"/Visualization")){ +// log.info("缓存取值>>>>>>>>>>"); +// return R.data(bladeRedis.get(Url+"/Visualization")); +// } List > pages = warehouseGoodsAllocationService.selectVisualization(warehouseGoodsAllocation); + // bladeRedis.setEx(Url+"/Visualization",pages,360L); return R.data(pages); } /** - * 货位 统计库位数量 + * 货位 统计所有库位数量 */ @GetMapping("/locationsnub") @ApiOperationSupport(order = 3) - @ApiOperation(value = "货位 统计库位数量", notes = "传入warehouseGoodsAllocation") - public R locationsnub(WarehouseGoodsAllocationVO warehouseGoodsAllocation) { - locationsnubVO locationsnubVO = warehouseGoodsAllocationService.selectlocationsnub(warehouseGoodsAllocation); + @ApiOperation(value = "货位 统计所有库位数量") + public R locationsnub() { + if (null !=bladeRedis.get(Url+"/locationsnub)")){ + log.info("缓存取值>>>>>>>>>>"); + return R.data(bladeRedis.get(Url+"/locationsnub")); + } + locationsnubVO locationsnubVO = warehouseGoodsAllocationService.selectlocationsnub(); + bladeRedis.setEx(Url+"/locationsnub",locationsnubVO,360L); return R.data(locationsnubVO); } + /** + * 货位 统计每个货区数量 + */ + @GetMapping("/cargoNub") + @ApiOperationSupport(order = 3) + @ApiOperation(value = "货位 统计每个货区数量") + public R cargoNub() { + if (null !=bladeRedis.get(Url+"/cargoNub")){ + log.info("缓存取值>>>>>>>>>>"); + return R.data(bladeRedis.get(Url+"/cargoNub")); + } + List list = warehouseGoodsAllocationService.selectcargoNub(); + bladeRedis.setEx(Url+"/cargoNub",list,360L); + return R.data(list); + } /** * 货位 查询包件 */ @@ -435,7 +466,7 @@ public class WarehouseGoodsAllocationController extends BladeController { log.warn(e.message); return R.fail(e.code,e.message); }catch (Exception e){ - log.error("/downAllocation系统异常，联系管理员",e); + log.error("货位 下架货位系统异常，联系管理员",e); return R.fail(500,"系统异常，联系管理员"); } return R.success("下架成功"); diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseGoodsAllocationMapper.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseGoodsAllocationMapper.java index d9b85d4cc..51aa3400a 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseGoodsAllocationMapper.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseGoodsAllocationMapper.java @@ -152,4 +152,10 @@ public interface WarehouseGoodsAllocationMapper extends BaseMapper selectAllZeroOrder(IPage page,@Param("param") WarehouseStockArticleCopyDTO warehouseStockArticleCopyDTO); + /** + *查询货区 + * + * @return + */ + List selectCargoSumId(); } diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseGoodsAllocationMapper.xml b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseGoodsAllocationMapper.xml index 7edc91615..bdad929e5 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseGoodsAllocationMapper.xml +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseGoodsAllocationMapper.xml @@ -40,16 +40,30 @@ select lbm.product_code productCode, lbm.name name from logpm_basicdata_material lbm join logpm_warehouse_updown_goods lwug on lbm.id = lwug.association_id WHERE lwug.association_type = '4' and lwug.allocation_id = #{id} SELECT ldsa.* FROM logpm_distribution_stock_article ldsa join logpm_warehouse_updown_goods lwug on lwug.association_id = ldsa.id WHERE ldsa.is_zero ='1' + diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseGoodsAllocationService.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseGoodsAllocationService.java index 5941b3a71..3d868718b 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseGoodsAllocationService.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseGoodsAllocationService.java @@ -107,5 +107,9 @@ public interface IWarehouseGoodsAllocationService extends BaseService selectcargoNub(); } diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseGoodsAllocationServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseGoodsAllocationServiceImpl.java index 3b44d1114..4748fc958 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseGoodsAllocationServiceImpl.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseGoodsAllocationServiceImpl.java @@ -32,6 +32,7 @@ import lombok.extern.log4j.Log4j; import lombok.extern.log4j.Log4j2; import org.springblade.core.mp.support.BladePage; import org.springblade.core.mp.support.Query; +import org.springblade.core.redis.cache.BladeRedis; import org.springblade.core.tool.utils.Func; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.core.conditions.Wrapper; @@ -42,6 +43,7 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.HashSet; import java.util.List; +import java.util.concurrent.TimeUnit; /** * 货位 服务实现类 @@ -57,6 +59,7 @@ public class WarehouseGoodsAllocationServiceImpl extends BaseServiceImpl selectWarehouseGoodsAllocationPage(IPage page, WarehouseGoodsAllocationVO warehouseGoodsAllocation) { return page.setRecords(baseMapper.selectWarehouseGoodsAllocationPage(page, warehouseGoodsAllocation)); @@ -108,6 +111,7 @@ public class WarehouseGoodsAllocationServiceImpl extends BaseServiceImpl> arrayListTwo = new ArrayList<>(map.values()); log.info("排序后>>>>>>>>>>>>>>{}",map); + return arrayListTwo; } @@ -237,7 +241,7 @@ public class WarehouseGoodsAllocationServiceImpl extends BaseServiceImpl().lambda() @@ -266,4 +270,44 @@ public class WarehouseGoodsAllocationServiceImpl extends BaseServiceImpl selectcargoNub() { + + //查询所有货区id + List list =baseMapper.selectCargoSumId(); + for (WarehouseCargoSumVO warehouseCargoSumVO : list) { + Long id = warehouseCargoSumVO.getId(); + //查询该货区下的总货位 + Integer cargoNub = baseMapper.selectCount(new QueryWrapper().lambda() + .eq(WarehouseGoodsAllocationEntity::getIsDeleted, 0) + .eq(WarehouseGoodsAllocationEntity::getGoodsAreaId,id) + ).intValue(); + //查询所有使用货位 + Integer employNub = baseMapper.selectCount(new QueryWrapper().lambda() + .eq(WarehouseGoodsAllocationEntity::getIsDeleted, 0) + .eq(WarehouseGoodsAllocationEntity::getAllocationStatus, 2) + .eq(WarehouseGoodsAllocationEntity::getGoodsAreaId,id) + ).intValue(); + //查询所有禁用 + Integer disableNub = baseMapper.selectCount(new QueryWrapper().lambda() + .eq(WarehouseGoodsAllocationEntity::getIsDeleted, 0) + .eq(WarehouseGoodsAllocationEntity::getEnableStatus, 2) + .eq(WarehouseGoodsAllocationEntity::getGoodsAreaId,id) + ).intValue(); + //查询可用货位 + Integer unusedNub = baseMapper.selectCount(new QueryWrapper().lambda() + .eq(WarehouseGoodsAllocationEntity::getIsDeleted, 0) + .eq(WarehouseGoodsAllocationEntity::getEnableStatus, 1) + .eq(WarehouseGoodsAllocationEntity::getAllocationStatus,1) + .eq(WarehouseGoodsAllocationEntity::getGoodsAreaId,id) + ).intValue(); + warehouseCargoSumVO.setCargoNub(cargoNub); + warehouseCargoSumVO.setEmployNub(employNub); + warehouseCargoSumVO.setDisableNub(disableNub); + warehouseCargoSumVO.setUnusedNub(unusedNub); + } + + return list; + } + }