From 0bafb9a323eb2ca1bad5a55381e1be6c569d6ea4 Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Tue, 15 Aug 2023 14:12:22 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=B8=8A=E6=9E=B6=E6=96=B0=E5=A2=9E=E5=BA=93?= =?UTF-8?q?=E5=AD=98=E5=93=81=E7=9A=84=E5=95=86=E5=9C=BA=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/WarehouseUpdownGoodsEntity.java | 6 + .../entity/WarehouseUpdownGoodsLogEntity.java | 7 + .../warehouse/vo/UpAllocationGoodsVO.java | 18 +++ .../warehouse/vo/UpShelfAllocationVO.java | 30 +++++ .../com/logpm/warehouse/vo/UpShelfDataVO.java | 5 +- .../api/WarehouseUpdownTypeApiController.java | 39 ++++-- .../mapper/WarehouseTrayGoodsMapper.java | 3 + .../mapper/WarehouseTrayGoodsMapper.xml | 21 ++- .../mapper/WarehouseUpdownGoodsMapper.java | 3 + .../mapper/WarehouseUpdownGoodsMapper.xml | 5 + .../service/IWarehouseTrayGoodsService.java | 3 + .../service/IWarehouseUpdownGoodsService.java | 3 + .../service/IWarehouseUpdownTypeService.java | 3 + .../impl/WarehouseTrayGoodsServiceImpl.java | 5 + .../impl/WarehouseUpdownGoodsServiceImpl.java | 6 + .../impl/WarehouseUpdownTypeServiceImpl.java | 122 +++++++++++++++--- 16 files changed, 249 insertions(+), 30 deletions(-) create mode 100644 blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/UpAllocationGoodsVO.java create mode 100644 blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/UpShelfAllocationVO.java diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseUpdownGoodsEntity.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseUpdownGoodsEntity.java index 79290cb90..6a4cdd76e 100644 --- a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseUpdownGoodsEntity.java +++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseUpdownGoodsEntity.java @@ -70,5 +70,11 @@ public class WarehouseUpdownGoodsEntity extends TenantEntity { /** 数量 */ @ApiModelProperty(name = "数量",notes = "") private String num ; + /** 商场id */ + @ApiModelProperty(name = "商场id",notes = "") + private Long marketId ; + /** 商场名称 */ + @ApiModelProperty(name = "商场名称",notes = "") + private String marketName ; } diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseUpdownGoodsLogEntity.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseUpdownGoodsLogEntity.java index 0a6ab0574..62db59d3c 100644 --- a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseUpdownGoodsLogEntity.java +++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseUpdownGoodsLogEntity.java @@ -79,5 +79,12 @@ public class WarehouseUpdownGoodsLogEntity extends TenantEntity { /** 备注 */ @ApiModelProperty(name = "备注",notes = "") private String remark ; + /** 商场id */ + @ApiModelProperty(name = "商场id",notes = "") + private Long marketId ; + /** 商场名称 */ + @ApiModelProperty(name = "商场名称",notes = "") + private String marketName ; + } diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/UpAllocationGoodsVO.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/UpAllocationGoodsVO.java new file mode 100644 index 000000000..dcea1283e --- /dev/null +++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/UpAllocationGoodsVO.java @@ -0,0 +1,18 @@ +package com.logpm.warehouse.vo; + +import lombok.Data; + +import java.io.Serializable; + +@Data +public class UpAllocationGoodsVO implements Serializable { + + private String orderCode;//订单自编码 + + private String materialCode;//物料编码 + + private Integer totalNum;//订单总数量 + + private Integer enterNum;//录入数量 + +} diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/UpShelfAllocationVO.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/UpShelfAllocationVO.java new file mode 100644 index 000000000..5dd50a2fe --- /dev/null +++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/UpShelfAllocationVO.java @@ -0,0 +1,30 @@ +package com.logpm.warehouse.vo; + +import lombok.Data; + +import java.io.Serializable; +import java.util.ArrayList; +import java.util.List; + +@Data +public class UpShelfAllocationVO implements Serializable { + + private Long warehouseId;//仓库id + private String warehouseName;//仓库名称 + private Long areaId;//货区id + private String areaTitle;//货区名称 + private Long shelfId;//货架id + private String shelfTitle;//货架名称 + private Long allocationId;//货位id + private String allocationTitle;//货位名称 + private Integer totalNum;//货位总数量 + private Integer stockTotalNum;//库存品总数量 + private Integer orderTotalnum;//订单总数量数量 + private Integer stockNum;//库存品数量 + private Long trayId;//托盘id + private String trayCode;//托盘编码 + private Integer trayNum;//托盘数量 + + private List list = new ArrayList<>(); + +} diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/UpShelfDataVO.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/UpShelfDataVO.java index be39abe02..df1066080 100644 --- a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/UpShelfDataVO.java +++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/UpShelfDataVO.java @@ -10,7 +10,10 @@ public class UpShelfDataVO implements Serializable { private String orderCode;//订单自编号 private String orderPackageCode;//包条码 private String trayCode;//托盘号 - private Integer num;//订单总数量 + private Integer totalNum;//订单总数量 + private Integer shelfNum;//上架数据 private Integer completeSet;//是否齐套1否 2是 + private Long marketId;//商场id + private String marketName;//商场名称 } diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/api/WarehouseUpdownTypeApiController.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/api/WarehouseUpdownTypeApiController.java index 21f39cc14..543062ae5 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/api/WarehouseUpdownTypeApiController.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/api/WarehouseUpdownTypeApiController.java @@ -4,6 +4,7 @@ import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import com.logpm.warehouse.dto.UpdownTypeDTO; import com.logpm.warehouse.service.IWarehouseUpdownTypeService; import com.logpm.warehouse.vo.TragetAllocationVO; +import com.logpm.warehouse.vo.UpShelfAllocationVO; import com.logpm.warehouse.vo.UpShelfDataVO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -61,17 +62,33 @@ public class WarehouseUpdownTypeApiController { } -// @ResponseBody -// @PostMapping("/upShelf") -// @ApiOperationSupport(order = 1) -// @ApiOperation(value = "上架", notes = "传入trayTypeDTO") -// public R upShelf(@RequestBody UpdownTypeDTO updownTypeDTO) { -// String method = "###########upShelf: "; -// log.info(method + "上架 updownTypeDTO={}", updownTypeDTO); -// -// -// -// } + @ResponseBody + @PostMapping("/upShelfScanAllocation") + @ApiOperationSupport(order = 1) + @ApiOperation(value = "上架扫描库位", notes = "传入trayTypeDTO") + public R upShelfScanAllocation(@RequestBody UpdownTypeDTO updownTypeDTO) { + String method = "###########upShelfScanAllocation: "; + log.info(method + "上架扫描库位 updownTypeDTO={}", updownTypeDTO); + String code = updownTypeDTO.getCode();//码值 + try{ + if(!StringUtil.hasLength(code)){ + log.warn(method+"码值不能为空 code={}",code); + return R.fail(403,"码值不能为空"); + } + + //查询该库位的货物信息 + UpShelfAllocationVO upShelfAllocationVO = warehouseUpdownTypeService.upShelfScanAllocation(code); + return R.data(upShelfAllocationVO); + }catch (CustomerException e){ + log.warn(e.message); + return R.fail(e.code,e.message); + }catch (Exception e){ + log.error(method+"系统异常，联系管理员",e); + return R.fail(500,"系统异常，联系管理员"); + } + + + } //---------------------------------下架-------------------------- diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseTrayGoodsMapper.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseTrayGoodsMapper.java index e7bc74212..d4229171c 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseTrayGoodsMapper.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseTrayGoodsMapper.java @@ -28,4 +28,7 @@ public interface WarehouseTrayGoodsMapper extends BaseMapper getStockListNoDataByTrayTypeId(@Param("trayTypeId") Long trayTypeId); int deleteByMasterId(@Param("masterId") Long masterId); + + List getStockUpListByTrayTypeId(@Param("trayTypeId") Long trayTypeId); + } diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseTrayGoodsMapper.xml b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseTrayGoodsMapper.xml index cb61d5b1b..053c8adec 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseTrayGoodsMapper.xml +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseTrayGoodsMapper.xml @@ -18,14 +18,16 @@ + + diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseUpdownGoodsMapper.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseUpdownGoodsMapper.java index 2dcb8fa96..582c521cb 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseUpdownGoodsMapper.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseUpdownGoodsMapper.java @@ -17,6 +17,7 @@ package com.logpm.warehouse.mapper; import com.logpm.warehouse.entity.WarehouseUpdownGoodsEntity; +import com.logpm.warehouse.vo.UpShelfDataVO; import com.logpm.warehouse.vo.WarehouseUpdownGoodsVO; import com.logpm.warehouse.excel.WarehouseUpdownGoodsExcel; import com.baomidou.mybatisplus.core.mapper.BaseMapper; @@ -50,6 +51,8 @@ public interface WarehouseUpdownGoodsMapper extends BaseMapper exportWarehouseUpdownGoods(@Param("ew") Wrapper queryWrapper); + + List findPackageByUpdownTypeId(@Param("updownTypeId") Long updownTypeId); // /** // * 根据货位查询货物 // * diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseUpdownGoodsMapper.xml b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseUpdownGoodsMapper.xml index 924e8c465..3ca5f9c0e 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseUpdownGoodsMapper.xml +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseUpdownGoodsMapper.xml @@ -75,4 +75,9 @@ + + + diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseTrayGoodsService.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseTrayGoodsService.java index e0b0deb07..6f6bf2aae 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseTrayGoodsService.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseTrayGoodsService.java @@ -57,4 +57,7 @@ public interface IWarehouseTrayGoodsService extends BaseService getStockUpListByTrayTypeId(Long trayTypeId); + } diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseUpdownGoodsService.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseUpdownGoodsService.java index 641e2d080..19652ae32 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseUpdownGoodsService.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseUpdownGoodsService.java @@ -18,6 +18,7 @@ package com.logpm.warehouse.service; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.logpm.warehouse.entity.WarehouseUpdownGoodsEntity; +import com.logpm.warehouse.vo.UpShelfDataVO; import com.logpm.warehouse.vo.WarehouseUpdownGoodsVO; import com.logpm.warehouse.excel.WarehouseUpdownGoodsExcel; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -62,4 +63,6 @@ public interface IWarehouseUpdownGoodsService extends BaseService findPackageByUpdownTypeId(Long updownTypeId); } diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseUpdownTypeService.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseUpdownTypeService.java index a23ed5b71..8e9de26f1 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseUpdownTypeService.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseUpdownTypeService.java @@ -2,6 +2,7 @@ package com.logpm.warehouse.service; import com.logpm.warehouse.entity.WarehouseUpdownTypeEntity; import com.logpm.warehouse.vo.TragetAllocationVO; +import com.logpm.warehouse.vo.UpShelfAllocationVO; import com.logpm.warehouse.vo.UpShelfDataVO; import org.springblade.core.mp.base.BaseService; @@ -13,4 +14,6 @@ public interface IWarehouseUpdownTypeService extends BaseService findUpShelfScanGoods(String code, Integer upshelfScanType); + UpShelfAllocationVO upShelfScanAllocation(String code); + } diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayGoodsServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayGoodsServiceImpl.java index 3ee0c9888..c157c9393 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayGoodsServiceImpl.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayGoodsServiceImpl.java @@ -162,6 +162,11 @@ public class WarehouseTrayGoodsServiceImpl extends BaseServiceImpl getStockUpListByTrayTypeId(Long trayTypeId) { + return baseMapper.getStockUpListByTrayTypeId(trayTypeId); + } + @Override public Boolean deleteByMasterId(Long masterId) { int delete = baseMapper.delete(new QueryWrapper().lambda() diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownGoodsServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownGoodsServiceImpl.java index 197648578..831755c0b 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownGoodsServiceImpl.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownGoodsServiceImpl.java @@ -18,6 +18,7 @@ package com.logpm.warehouse.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.logpm.warehouse.entity.WarehouseUpdownGoodsEntity; +import com.logpm.warehouse.vo.UpShelfDataVO; import com.logpm.warehouse.vo.WarehouseUpdownGoodsVO; import com.logpm.warehouse.excel.WarehouseUpdownGoodsExcel; import com.logpm.warehouse.mapper.WarehouseUpdownGoodsMapper; @@ -65,4 +66,9 @@ public class WarehouseUpdownGoodsServiceImpl extends BaseServiceImpl findPackageByUpdownTypeId(Long updownTypeId) { + return baseMapper.findPackageByUpdownTypeId(updownTypeId); + } + } diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownTypeServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownTypeServiceImpl.java index 0b27ebf2f..2f6124d3c 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownTypeServiceImpl.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownTypeServiceImpl.java @@ -10,12 +10,10 @@ import com.logpm.distribution.feign.IDistributionStockArticleClient; import com.logpm.warehouse.entity.WarehouseTrayTypeEntity; import com.logpm.warehouse.entity.WarehouseUpdownTypeEntity; import com.logpm.warehouse.mapper.WarehouseUpdownTypeMapper; -import com.logpm.warehouse.service.IWarehouseTaryAllocationService; -import com.logpm.warehouse.service.IWarehouseTrayGoodsService; -import com.logpm.warehouse.service.IWarehouseTrayTypeService; -import com.logpm.warehouse.service.IWarehouseUpdownTypeService; +import com.logpm.warehouse.service.*; import com.logpm.warehouse.vo.GoodsVO; import com.logpm.warehouse.vo.TragetAllocationVO; +import com.logpm.warehouse.vo.UpShelfAllocationVO; import com.logpm.warehouse.vo.UpShelfDataVO; import lombok.AllArgsConstructor; import lombok.extern.log4j.Log4j2; @@ -44,6 +42,8 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl ls = distributionStockArticleClient.fingListByServiceNumber(serviceNumber); List list = new ArrayList<>(); for (Map map:ls){ UpShelfDataVO upShelfDataVO = new UpShelfDataVO(); upShelfDataVO.setServiceNum((String) map.get("serviceNum")); upShelfDataVO.setOrderCode((String) map.get("orderCode")); - upShelfDataVO.setNum((Integer) map.get("num")); + upShelfDataVO.setTotalNum((Integer) map.get("num")); upShelfDataVO.setCompleteSet((Integer) map.get("completeSet")); list.add(upShelfDataVO); } @@ -162,7 +156,7 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl updownTypeEntityQueryWrapper = new QueryWrapper<>(); + updownTypeEntityQueryWrapper.eq("area_id",goodsAreaId) + .eq("shelf_id",goodsShelfId) + .eq("allocation_id",allocationId) + .eq("is_deleted",0); + WarehouseUpdownTypeEntity updownTypeEntity = warehouseUpdownTypeService.getOne(updownTypeEntityQueryWrapper); + if(Objects.isNull(updownTypeEntity)){ + log.warn("#############upShelfScanAllocation: 库位暂无数据 allocationId={}",allocationId); + return upShelfAllocationVO; + }else{ + Long updownTypeId = updownTypeEntity.getId();//库位打包货物方式id + //同一个货位上能存所有类型的货物，所以要分三类来查 association_type 1订单号（零担） 3包件码（订单号） 4库存品 + List packageList = warehouseUpdownGoodsService.findPackageByUpdownTypeId(updownTypeId); + + + } + + + }else { + //有托盘就查询托盘上的数据 + Long trayId = basicdataTrayEntity.getId(); + + QueryWrapper trayTypeEntityQueryWrapper = new QueryWrapper<>(); + trayTypeEntityQueryWrapper.eq("tray_id",trayId) + .eq("is_deleted",0); + WarehouseTrayTypeEntity trayTypeEntity = warehouseTrayTypeService.getOne(trayTypeEntityQueryWrapper); + if(Objects.isNull(trayTypeEntity)){ + log.warn("#############upShelfScanAllocation: 托盘未找到打托数据 trayId={}",trayId); + throw new CustomerException(403,"托盘未找到打托数据"); + } + Long trayTypeId = trayTypeEntity.getId();//打托方式id + String type = trayTypeEntity.getType();//打托分类 + List listByTrayTypeId = null; + if(PalletProductTypeConstant.CUSTOMIZED.equals(type)){ + upShelfAllocationVO.setTotalNum(trayTypeEntity.getTotalNum()); + listByTrayTypeId = warehouseTrayGoodsService.getUpListByTrayTypeId(trayTypeId); + }else if(PalletProductTypeConstant.ARTIFICIAL.equals(type)){ + upShelfAllocationVO.setTotalNum(trayTypeEntity.getTotalNum()); + listByTrayTypeId = warehouseTrayGoodsService.getZeroUpListByTrayTypeId(trayTypeId); + }else if(PalletProductTypeConstant.STOCKDATA.equals(type)){ + upShelfAllocationVO.setStockTotalNum(trayTypeEntity.getTotalNum()); + listByTrayTypeId = warehouseTrayGoodsService.getStockUpListByTrayTypeId(trayTypeId); + }else if(PalletProductTypeConstant.STOCKNODATA.equals(type)){ + upShelfAllocationVO.setStockTotalNum(trayTypeEntity.getTotalNum()); + listByTrayTypeId = warehouseTrayGoodsService.getStockUpListByTrayTypeId(trayTypeId); + } + upShelfAllocationVO.setList(listByTrayTypeId); + return upShelfAllocationVO; + } + return null; + } }