From 8764cedc8198463196c5cc390575b322536c3b52 Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Thu, 17 Aug 2023 14:35:42 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=AE=8C=E6=88=90=E5=A4=8D=E6=A0=B8=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=202.=E6=89=98=E7=9B=98=E7=A9=BA=E7=BD=AE=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/logpm/warehouse/vo/GoodsVO.java | 12 +- .../logpm/warehouse/vo/ReCheckTrayListVO.java | 3 + .../api/WarehouseInventoryApiController.java | 105 ++++++++++++++---- .../api/WarehouseTrayTypeApiController.java | 28 +++++ .../api/WarehouseUpdownTypeApiController.java | 10 +- .../com/logpm/warehouse/dto/CheckDTO.java | 4 + .../mapper/WarehouseTrayGoodsMapper.java | 7 ++ .../mapper/WarehouseTrayGoodsMapper.xml | 37 ++++++ .../mapper/WarehouseUpdownTypeMapper.java | 2 + .../mapper/WarehouseUpdownTypeMapper.xml | 30 +++-- .../service/IWarehouseInventoryService.java | 6 +- .../service/IWarehouseTrayGoodsService.java | 7 ++ .../service/IWarehouseTrayTypeService.java | 11 +- .../service/IWarehouseUpdownTypeService.java | 2 +- .../impl/WarehouseInventoryServiceImpl.java | 15 +-- .../impl/WarehouseTrayGoodsServiceImpl.java | 16 +++ .../impl/WarehouseTrayTypeServiceImpl.java | 31 ++++++ .../impl/WarehouseUpdownTypeServiceImpl.java | 28 ++--- 18 files changed, 285 insertions(+), 69 deletions(-) diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/GoodsVO.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/GoodsVO.java index e9e525075..815ce4fd4 100644 --- a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/GoodsVO.java +++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/GoodsVO.java @@ -7,12 +7,12 @@ import java.io.Serializable; @Data public class GoodsVO implements Serializable { - private String dataCode;//货物编码 - - private Integer goodsType;//货物类型 1.订单 2运单 3包件 4库存品 - + private String orderCode;//订单自编码 + private String code;//码值 + private Integer goodsType;//物品类型 1包件 2零担 3库存品 private Integer num;//数量 - - private String name;//名称 + private Long marketId;//商场id + private String marketName;//商场名称 + private String name; } diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/ReCheckTrayListVO.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/ReCheckTrayListVO.java index 3a7e3c38d..f659c8b1e 100644 --- a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/ReCheckTrayListVO.java +++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/ReCheckTrayListVO.java @@ -11,4 +11,7 @@ public class ReCheckTrayListVO implements Serializable { private String code;//码值 private Integer goodsType;//物品类型 1包件 2零担 3库存品 private Integer num;//数量 + private Long marketId;//商场id + private String marketName;//商场名称 + private String name; } diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/api/WarehouseInventoryApiController.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/api/WarehouseInventoryApiController.java index 35617c694..2a18d84e3 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/api/WarehouseInventoryApiController.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/api/WarehouseInventoryApiController.java @@ -3,8 +3,10 @@ package com.logpm.warehouse.api; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import com.logpm.warehouse.dto.CheckDTO; import com.logpm.warehouse.service.IWarehouseInventoryService; +import com.logpm.warehouse.service.IWarehouseUpdownTypeService; import com.logpm.warehouse.vo.ReCheckOrderVO; import com.logpm.warehouse.vo.ReCheckTrayVO; +import com.logpm.warehouse.vo.TragetAllocationVO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; @@ -25,35 +27,61 @@ public class WarehouseInventoryApiController { private final IWarehouseInventoryService warehouseInventoryService; + private final IWarehouseUpdownTypeService warehouseUpdownTypeService; + @ResponseBody - @PostMapping("/checkGoodsByType") + @PostMapping("/checkGoodsByOrder") @ApiOperationSupport(order = 1) - @ApiOperation(value = "通过不同码值复核", notes = "传入checkDTO") - public R checkGoodsByType(@RequestBody CheckDTO checkDTO) { - String method = "###########checkGoodsByType: "; - log.info(method + "上架扫码货物 checkDTO={}", checkDTO); - Integer codeType = checkDTO.getCodeType();//码值类型 1包条码 2托盘码 3库位码 - String code = checkDTO.getCode();//码值 + @ApiOperation(value = "复核订单", notes = "传入checkDTO") + public R checkGoodsByOrder(@RequestBody CheckDTO checkDTO) { + String method = "###########checkGoodsByOrder: "; + log.info(method + "复核订单 checkDTO={}", checkDTO); +// Integer codeType = checkDTO.getCodeType();//码值类型 1订单号 2运单号 + String orderPackageCode = checkDTO.getCode();//包件码 try{ - if(!StringUtil.hasLength(code)){ - log.warn(method+"码值不能为空 code={}",code); - return R.fail(403,"码值不能为空"); - } - if(Objects.isNull(codeType)){ - log.warn(method+"码值类型不能为空 codeType={}",codeType); - return R.fail(403,"码值类型不能为空"); + if(!StringUtil.hasLength(orderPackageCode)){ + log.warn(method+"包件码不能为空 orderPackageCode={}",orderPackageCode); + return R.fail(403,"包件码不能为空"); } +// if(Objects.isNull(codeType)){ +// log.warn(method+"码值类型不能为空 codeType={}",codeType); +// return R.fail(403,"码值类型不能为空"); +// } //查询该库位的货物信息 - if(codeType == 1){ - ReCheckOrderVO reCheckOrderVO = warehouseInventoryService.getReCheckOrder(code); - }else if(codeType == 2){ - ReCheckTrayVO reCheckTrayVOS = warehouseInventoryService.getReCheckTray(code); - } + ReCheckOrderVO reCheckOrderVO = warehouseInventoryService.getReCheckOrder(orderPackageCode); + return R.data(reCheckOrderVO); + }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,"系统异常，联系管理员"); + } + } -// List upShelfDataVOs = warehouseUpdownTypeService.findUpShelfScanGoods(code,upshelfScanType); - return R.success("success"); + @ResponseBody + @PostMapping("/checkGoodsByTray") + @ApiOperationSupport(order = 1) + @ApiOperation(value = "复核托盘", notes = "传入checkDTO") + public R checkGoodsByTray(@RequestBody CheckDTO checkDTO) { + String method = "###########checkGoodsByTray: "; + log.info(method + "复核托盘 checkDTO={}", checkDTO); + String trayCode = checkDTO.getTrayCode(); + try{ + if(!StringUtil.hasLength(trayCode)){ + log.warn(method+"托盘码不能为空 trayCode={}",trayCode); + return R.fail(403,"托盘码不能为空"); + } +// if(Objects.isNull(codeType)){ +// log.warn(method+"码值类型不能为空 codeType={}",codeType); +// return R.fail(403,"码值类型不能为空"); +// } + + //查询该库位的货物信息 + ReCheckTrayVO reCheckTrayVO = warehouseInventoryService.getReCheckTray(trayCode); + return R.data(reCheckTrayVO); }catch (CustomerException e){ log.warn(e.message); return R.fail(e.code,e.message); @@ -61,6 +89,41 @@ public class WarehouseInventoryApiController { log.error(method+"系统异常，联系管理员",e); return R.fail(500,"系统异常，联系管理员"); } + } + + @ResponseBody + @PostMapping("/checkGoodsByAllocation") + @ApiOperationSupport(order = 1) + @ApiOperation(value = "复核库位", notes = "传入checkDTO") + public R checkGoodsByAllocation(@RequestBody CheckDTO checkDTO) { + String method = "###########checkGoodsByAllocation: "; + log.info(method + "复核库位 checkDTO={}", checkDTO); + Long allocationId = checkDTO.getAllocationId(); + try{ + if(Objects.isNull(allocationId)){ + log.warn(method+"库位ID不能为空 allocationId={}",allocationId); + return R.fail(403,"库位ID不能为空"); + } +// if(Objects.isNull(codeType)){ +// log.warn(method+"码值类型不能为空 codeType={}",codeType); +// return R.fail(403,"码值类型不能为空"); +// } + + //查询该库位的货物信息 + TragetAllocationVO goodsByAllocation = warehouseUpdownTypeService.findGoodsByAllocation(allocationId); + return R.data(goodsByAllocation); + }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/api/WarehouseTrayTypeApiController.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/api/WarehouseTrayTypeApiController.java index 71be3e940..af452ef3a 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/api/WarehouseTrayTypeApiController.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/api/WarehouseTrayTypeApiController.java @@ -656,4 +656,32 @@ public class WarehouseTrayTypeApiController { } } + + //-------------------------------托盘空置--------------- + + @ResponseBody + @PostMapping("/trayToNull") + @ApiOperationSupport(order = 1) + @ApiOperation(value = "托盘空置", notes = "传入trayTypeDTO") + public R trayToNull(@RequestBody TrayTypeDTO trayTypeDTO) { + String method = "###########trayToNull: "; + log.info(method + "托盘空置 trayTypeDTO={}", trayTypeDTO); + String trayCode = trayTypeDTO.getTrayCode(); + try{ + if(!StringUtil.hasLength(trayCode)){ + log.warn(method+"托盘码不能为空 trayCode={}",trayCode); + return R.fail(403,"托盘码不能为空"); + } + + return warehouseTrayTypeService.trayToNull(trayCode); + }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/api/WarehouseUpdownTypeApiController.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/api/WarehouseUpdownTypeApiController.java index 8de7ae14a..a961531ac 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 @@ -3,7 +3,6 @@ package com.logpm.warehouse.api; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import com.logpm.warehouse.dto.*; 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; @@ -540,21 +539,16 @@ public class WarehouseUpdownTypeApiController { String method = "###########moveAllocationScanTarget: "; log.info(method + "移库扫描目标库位 updownTypeDTO={}", updownTypeDTO); Long allocationId = updownTypeDTO.getAllocationId();//目标库位码 - Integer moveType = updownTypeDTO.getMoveType();//移库方式 1货物 2托盘 try{ if(Objects.isNull(allocationId)){ log.warn(method+"目标库位码不能为空 allocationId={}",allocationId); return R.fail(403,"目标库位码不能为空"); } - if(Objects.isNull(moveType)){ - log.warn(method+"移库方式不能为空 moveType={}",moveType); - return R.fail(403,"移库方式不能为空"); - } //查询该库位的货物信息 - TragetAllocationVO tragetAllocationVO = warehouseUpdownTypeService.findGoodsByAllocation(allocationId,moveType); - return R.data(tragetAllocationVO); + UpShelfAllocationVO upShelfAllocationVO = warehouseUpdownTypeService.upShelfScanAllocation(allocationId); + return R.data(upShelfAllocationVO); }catch (CustomerException e){ log.warn(e.message); return R.fail(e.code,e.message); diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/dto/CheckDTO.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/dto/CheckDTO.java index a761dc997..f837d76dc 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/dto/CheckDTO.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/dto/CheckDTO.java @@ -10,4 +10,8 @@ public class CheckDTO implements Serializable { private Integer codeType;//码值类型 1包条码 2托盘码 3库位码 private String code;//码值 + private String trayCode;//托盘码 + + private Long allocationId;//库位id + } 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 abb321627..f93b40acc 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 @@ -3,6 +3,7 @@ package com.logpm.warehouse.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.logpm.distribution.entity.DistributionParcelListEntity; import com.logpm.warehouse.entity.WarehouseTrayGoodsEntity; +import com.logpm.warehouse.vo.ReCheckTrayListVO; import com.logpm.warehouse.vo.TrayTypeDataListVO; import com.logpm.warehouse.vo.UpShelfDataVO; import org.apache.ibatis.annotations.Mapper; @@ -39,4 +40,10 @@ public interface WarehouseTrayGoodsMapper extends BaseMapper getStockTotalNumAndNum(@Param("trayTypeId") Long trayTypeId); void deleteByIdList(@Param("ids") List ids); + + List getReCheckPackageByTrayTypeId(@Param("trayTypeId") Long trayTypeId); + + List getReCheckZeroByTrayTypeId(@Param("trayTypeId") Long trayTypeId); + + List getReCheckStockByTrayTypeId(@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 b90b6eb9b..98ffc720c 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 @@ -154,4 +154,41 @@ + + + + + + diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseUpdownTypeMapper.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseUpdownTypeMapper.java index dcc3adb95..3365ca292 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseUpdownTypeMapper.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseUpdownTypeMapper.java @@ -23,4 +23,6 @@ public interface WarehouseUpdownTypeMapper extends BaseMapper selectStockListByUpdownTypeId(@Param("updownTypeId") Long updownTypeId); } diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseUpdownTypeMapper.xml b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseUpdownTypeMapper.xml index 3743fd884..c522099d4 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseUpdownTypeMapper.xml +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseUpdownTypeMapper.xml @@ -4,9 +4,10 @@ + + update logpm_warehouse_updown_type diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseInventoryService.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseInventoryService.java index a17be03c1..789786773 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseInventoryService.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseInventoryService.java @@ -6,10 +6,8 @@ import com.logpm.warehouse.vo.ReCheckTrayVO; public interface IWarehouseInventoryService { - ReCheckOrderVO getReCheckOrder(String code); - - ReCheckTrayVO getReCheckTray(String code); - + ReCheckOrderVO getReCheckOrder(String orderPackageCode); + ReCheckTrayVO getReCheckTray(String trayCode); } 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 56a75951c..d619c0d3e 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 @@ -4,6 +4,7 @@ import com.logpm.distribution.entity.DistributionParcelListEntity; import com.logpm.distribution.entity.DistributionStockArticleEntity; import com.logpm.warehouse.entity.WarehouseTrayGoodsEntity; import com.logpm.warehouse.entity.WarehouseTrayTypeEntity; +import com.logpm.warehouse.vo.ReCheckTrayListVO; import com.logpm.warehouse.vo.TrayTypeDataListVO; import com.logpm.warehouse.vo.UpShelfDataVO; import org.springblade.core.mp.base.BaseService; @@ -68,4 +69,10 @@ public interface IWarehouseTrayGoodsService extends BaseService getStockTotalNumAndNum(Long trayTypeId); void deleteByIdList(List trayGoodsList); + + List getReCheckPackageByTrayTypeId(Long trayTypeId); + + List getReCheckZeroByTrayTypeId(Long trayTypeId); + + List getReCheckStockByTrayTypeId(Long trayTypeId); } diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseTrayTypeService.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseTrayTypeService.java index eafa1a2ed..eae950f1e 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseTrayTypeService.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseTrayTypeService.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.logpm.warehouse.dto.TrayTypeDTO; import com.logpm.warehouse.dto.ZeroOrderVO; import com.logpm.warehouse.entity.WarehouseTrayTypeEntity; +import com.logpm.warehouse.vo.ReCheckTrayListVO; import com.logpm.warehouse.vo.TrayTypeDataListVO; import com.logpm.warehouse.vo.TrayTypeDataVO; import com.logpm.warehouse.vo.WarehouseTrayTypeVO; @@ -54,5 +55,13 @@ public interface IWarehouseTrayTypeService extends BaseService getReCheckPackageByTrayTypeId(Long trayTypeId); + + List getReCheckZeroByTrayTypeId(Long trayTypeId); + + List getReCheckStockByTrayTypeId(Long trayTypeId); + + R trayToNull(String trayCode); } 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 48907f914..7785dce6d 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 @@ -15,7 +15,7 @@ import java.util.List; public interface IWarehouseUpdownTypeService extends BaseService { - TragetAllocationVO findGoodsByAllocation(Long allocationId, Integer moveType); + TragetAllocationVO findGoodsByAllocation(Long allocationId); List findUpShelfScanGoods(String code, Integer upshelfScanType); diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseInventoryServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseInventoryServiceImpl.java index f3cfe60e2..84e738611 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseInventoryServiceImpl.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseInventoryServiceImpl.java @@ -11,6 +11,7 @@ import com.logpm.warehouse.service.IWarehouseInventoryService; import com.logpm.warehouse.service.IWarehouseTrayTypeService; import com.logpm.warehouse.vo.ReCheckOrderListVO; import com.logpm.warehouse.vo.ReCheckOrderVO; +import com.logpm.warehouse.vo.ReCheckTrayListVO; import com.logpm.warehouse.vo.ReCheckTrayVO; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -74,19 +75,19 @@ public class WarehouseInventoryServiceImpl implements IWarehouseInventoryService reCheckTrayVO.setTotalNum(0); }else{ reCheckTrayVO.setTotalNum(trayTypeEntity.getTotalNum()); - String type = trayTypeEntity.getType();//分拣大类 1扫码分拣（订制品） 2人工分拣（零担） 3有数据库存品 4无数据库存品 + String type = trayTypeEntity.getType();//分拣大类 1扫码分拣（订制品） 2人工分拣（零担） 3库存品 Long trayTypeId = trayTypeEntity.getId(); + List reCheckTrayListVOS = null; if("1".equals(type)){ -// warehouseTrayTypeService. + reCheckTrayListVOS = warehouseTrayTypeService.getReCheckPackageByTrayTypeId(trayTypeId); }else if("2".equals(type)){ - + reCheckTrayListVOS = warehouseTrayTypeService.getReCheckZeroByTrayTypeId(trayTypeId); }else if("3".equals(type)){ - - }else if("4".equals(type)){ - + reCheckTrayListVOS = warehouseTrayTypeService.getReCheckStockByTrayTypeId(trayTypeId); } + reCheckTrayVO.setList(reCheckTrayListVOS); } - return reCheckTrayVO; } + } 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 22827a1a9..fe758b7a9 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 @@ -10,6 +10,7 @@ import com.logpm.warehouse.mapper.WarehouseTrayGoodsMapper; import com.logpm.warehouse.mapper.WarehouseTrayTypeMapper; import com.logpm.warehouse.service.IWarehouseTrayGoodsLogService; import com.logpm.warehouse.service.IWarehouseTrayGoodsService; +import com.logpm.warehouse.vo.ReCheckTrayListVO; import com.logpm.warehouse.vo.TrayTypeDataListVO; import com.logpm.warehouse.vo.UpShelfDataVO; import lombok.AllArgsConstructor; @@ -201,6 +202,21 @@ public class WarehouseTrayGoodsServiceImpl extends BaseServiceImpl getReCheckPackageByTrayTypeId(Long trayTypeId) { + return baseMapper.getReCheckPackageByTrayTypeId(trayTypeId); + } + + @Override + public List getReCheckZeroByTrayTypeId(Long trayTypeId) { + return baseMapper.getReCheckZeroByTrayTypeId(trayTypeId); + } + + @Override + public List getReCheckStockByTrayTypeId(Long trayTypeId) { + return baseMapper.getReCheckStockByTrayTypeId(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/WarehouseTrayTypeServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java index dece1b259..d4aa93f12 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java @@ -23,6 +23,7 @@ import com.logpm.warehouse.mapper.WarehouseTrayTypeMapper; import com.logpm.warehouse.service.IWarehouseTrayGoodsLogService; import com.logpm.warehouse.service.IWarehouseTrayGoodsService; import com.logpm.warehouse.service.IWarehouseTrayTypeService; +import com.logpm.warehouse.vo.ReCheckTrayListVO; import com.logpm.warehouse.vo.TrayTypeDataListVO; import com.logpm.warehouse.vo.TrayTypeDataVO; import com.logpm.warehouse.vo.WarehouseTrayTypeVO; @@ -1195,6 +1196,36 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl getReCheckPackageByTrayTypeId(Long trayTypeId) { + return warehouseTrayGoodsService.getReCheckPackageByTrayTypeId(trayTypeId); + } + + @Override + public List getReCheckZeroByTrayTypeId(Long trayTypeId) { + return warehouseTrayGoodsService.getReCheckZeroByTrayTypeId(trayTypeId); + } + + @Override + public List getReCheckStockByTrayTypeId(Long trayTypeId) { + return warehouseTrayGoodsService.getReCheckStockByTrayTypeId(trayTypeId); + } + + @Override + public R trayToNull(String trayCode) { + //查询托盘信息 + BasicdataTrayEntity trayEntity = basicdataTrayClient.getTrayByTrayCode(trayCode); + if(Objects.isNull(trayEntity)){ + log.warn("#########trayToNull: 未找到托盘信息 trayCode={}",trayCode); + throw new CustomerException(403,"未找到托盘信息"); + } + Long trayId = trayEntity.getId(); + + downTrayGoodsByTrayId(trayId,"托盘空置"); + + return R.success("空置成功"); + } + private void saveTrayGoodsLog(List trayGoodsList, WarehouseTrayTypeEntity trayTypeEntity, String bindingType, String remark, String palletizingType) { List ls = new ArrayList<>(); for (WarehouseTrayGoodsEntity trayGoodsEntity:trayGoodsList){ 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 700b88635..9d8076fd7 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 @@ -49,7 +49,7 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl zeroGoodsList = baseMapper.selectZeroListByUpdownTypeId(updownTypeId); tragetAllocationVO.getGoodsList().addAll(zeroGoodsList); -// //有数据库存品 TODO 暂时取值逻辑不清晰 -// List stockGoodsList = baseMapper.selectStockListByUpdownTypeId(updownTypeId); -// //无数据库存品 TODO 暂时取值逻辑不清晰 -// List stockNoDataGoodsList = baseMapper.selectStockNoDataListByUpdownTypeId(updownTypeId); + //库存品 TODO 暂时取值逻辑不清晰 + List stockGoodsList = baseMapper.selectStockListByUpdownTypeId(updownTypeId); + tragetAllocationVO.getGoodsList().addAll(stockGoodsList); } - return tragetAllocationVO; } @@ -286,7 +284,9 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl trayTypeEntityQueryWrapper = new QueryWrapper<>(); trayTypeEntityQueryWrapper.eq("tray_id",trayId) .eq("is_deleted",0);