From 68960363f2363b95868553642ccfff65591327bf Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Thu, 14 Sep 2023 13:39:50 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=BA=93=E5=86=85=E4=BD=9C=E4=B8=9A=E9=80=BB?= =?UTF-8?q?=E8=BE=91=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../warehouse/vo/OrderUpshelfDetailVO.java | 20 +++++++ .../DistributionStockArticleServiceImpl.java | 5 +- .../api/WarehouseTrayTypeApiController.java | 8 ++- .../api/WarehouseUpdownTypeApiController.java | 58 +++++++++---------- .../logpm/warehouse/dto/UpShelfStockDTO.java | 1 + .../warehouse/dto/UpShelfZeroOrderDTO.java | 2 + .../mapper/WarehouseUpdownGoodsMapper.java | 4 ++ .../mapper/WarehouseUpdownGoodsMapper.xml | 13 +++++ .../service/IWarehouseTrayTypeService.java | 2 +- .../service/IWarehouseUpdownGoodsService.java | 4 ++ .../service/IWarehouseUpdownTypeService.java | 8 +-- .../impl/WarehouseTrayTypeServiceImpl.java | 7 ++- .../impl/WarehouseUpdownGoodsServiceImpl.java | 6 ++ .../impl/WarehouseUpdownTypeServiceImpl.java | 25 +++++++- 14 files changed, 120 insertions(+), 43 deletions(-) create mode 100644 blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/OrderUpshelfDetailVO.java diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/OrderUpshelfDetailVO.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/OrderUpshelfDetailVO.java new file mode 100644 index 000000000..54892abaf --- /dev/null +++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/OrderUpshelfDetailVO.java @@ -0,0 +1,20 @@ +package com.logpm.warehouse.vo; + +import lombok.Data; + +import java.io.Serializable; +import java.util.ArrayList; +import java.util.List; + +@Data +public class OrderUpshelfDetailVO implements Serializable { + + private String serviceNum;//服务号 + + private String orderCode;//订单号 + + private Integer totalNumber;//总数 + + private List list = new ArrayList<>(); + +} diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java index e9208ea30..2ca99814a 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java @@ -24,7 +24,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.baomidou.mybatisplus.extension.toolkit.SqlHelper; import com.logpm.basic.entity.BasicMaterialEntity; import com.logpm.basic.entity.BasicPrintTemplateEntity; import com.logpm.basic.feign.IBasicMaterialClient; @@ -49,7 +48,6 @@ import com.logpm.distribution.wrapper.DistributionStockArticleWrapper; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springblade.common.constant.DictBizConstant; -import org.springblade.common.constant.orderpackage.OrderPackageReservationStatusConstant; import org.springblade.common.constant.printTemplate.PrintTemplateStatusConstant; import org.springblade.common.utils.CommonUtil; import org.springblade.common.utils.FileUtil; @@ -75,7 +73,6 @@ import javax.servlet.http.HttpServletResponse; import java.awt.image.BufferedImage; import java.io.File; import java.io.IOException; -import java.math.BigDecimal; import java.util.*; import java.util.concurrent.ScheduledThreadPoolExecutor; import java.util.concurrent.TimeUnit; @@ -786,6 +783,7 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl queryWrapper = new QueryWrapper<>(); queryWrapper.eq("order_code",orderCode) .eq("warehouse_id",warehouseId) + .eq("is_zero",1) .eq("is_deleted",0); return baseMapper.selectOne(queryWrapper); } @@ -795,6 +793,7 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl queryWrapper = new QueryWrapper<>(); queryWrapper.eq("waybill_number",waybillNumber) .eq("warehouse_id",warehouseId) + .eq("is_zero",1) .eq("is_deleted",0); return baseMapper.selectList(queryWrapper); } 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 9e8eddfe6..2ba459f8a 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 @@ -392,6 +392,12 @@ public class WarehouseTrayTypeApiController { String trayType = trayTypeDTO.getTrayType();//打托方式 List zeroList = trayTypeDTO.getZeroList();//零担订单数据 try{ + + BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse(); + if(Objects.isNull(myCurrentWarehouse)){ + log.warn(method+"仓库信息为空 myCurrentWarehouse={}",myCurrentWarehouse); + return R.fail(403,"仓库信息为空"); + } if(!StringUtil.hasLength(trayCode)){ log.warn(method+"托盘号不能为空 trayCode={}",trayCode); return R.fail(403,"托盘号不能为空"); @@ -400,7 +406,7 @@ public class WarehouseTrayTypeApiController { log.warn(method+"打托方式不能为空 trayCode={}",trayCode); return R.fail(403,"打托方式不能为空"); } - return warehouseTrayTypeService.enterZeroOrderByTrayCode(trayType,trayCode,zeroList); + return warehouseTrayTypeService.enterZeroOrderByTrayCode(trayType,trayCode,zeroList,myCurrentWarehouse.getId()); }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/api/WarehouseUpdownTypeApiController.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/api/WarehouseUpdownTypeApiController.java index b260f28fe..6c7b85cd6 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 @@ -5,9 +5,7 @@ import com.logpm.basicdata.entity.BasicdataWarehouseEntity; import com.logpm.basicdata.feign.IBasicdataWarehouseClient; import com.logpm.warehouse.dto.*; import com.logpm.warehouse.service.IWarehouseUpdownTypeService; -import com.logpm.warehouse.vo.MovePackInfoVO; -import com.logpm.warehouse.vo.UpShelfAllocationVO; -import com.logpm.warehouse.vo.UpShelfDataVO; +import com.logpm.warehouse.vo.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; @@ -104,33 +102,33 @@ public class WarehouseUpdownTypeApiController { } } -// @ResponseBody -// @PostMapping("/orderUpshelfDetail") -// @ApiOperationSupport(order = 1) -// @ApiOperation(value = "已上架订单详情", notes = "传入trayTypeDTO") -// public R upShelfScanAllocation(@RequestBody UpdownTypeDTO updownTypeDTO ) { -// String method = "###########orderUpshelfDetail: "; -// log.info(method + "已上架订单详情 updownTypeDTO={}", updownTypeDTO); -// String orderCode = updownTypeDTO.getOrderCode(); -// try{ -// -// if(StringUtil.isBlank(orderCode)){ -// log.warn(method+"订单编码不能为空 orderCode={}",orderCode); -// return R.fail(403,"订单编码不能为空"); -// } -// -// //查询该库位的货物信息 -// PositionVO upShelfAllocationVO = warehouseUpdownTypeService.upShelfScanAllocation(allocationId,myCurrentWarehouse.getId()); -// 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,"系统异常，联系管理员"); -// } -// -// } + @ResponseBody + @PostMapping("/orderUpshelfDetail") + @ApiOperationSupport(order = 1) + @ApiOperation(value = "已上架订单详情", notes = "传入trayTypeDTO") + public R orderUpshelfDetail(@RequestBody UpdownTypeDTO updownTypeDTO ) { + String method = "###########orderUpshelfDetail: "; + log.info(method + "已上架订单详情 updownTypeDTO={}", updownTypeDTO); + String orderCode = updownTypeDTO.getOrderCode(); + try{ + + if(StringUtil.isBlank(orderCode)){ + log.warn(method+"订单编码不能为空 orderCode={}",orderCode); + return R.fail(403,"订单编码不能为空"); + } + + //查询该库位的货物信息 + OrderUpshelfDetailVO orderUpshelfDetailVO = warehouseUpdownTypeService.orderUpshelfDetail(orderCode); + return R.data(orderUpshelfDetailVO); + }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,"系统异常，联系管理员"); + } + + } @ResponseBody diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/dto/UpShelfStockDTO.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/dto/UpShelfStockDTO.java index d57d5facd..4e52542c0 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/dto/UpShelfStockDTO.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/dto/UpShelfStockDTO.java @@ -18,5 +18,6 @@ public class UpShelfStockDTO implements Serializable { @ApiModelProperty(name = "库位id",notes = "库位id") private Long allocationId;//库位id private String incomingBatch;//批次号 + private Integer num;//总数量 } diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/dto/UpShelfZeroOrderDTO.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/dto/UpShelfZeroOrderDTO.java index 9f88c6117..5e7e96fa8 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/dto/UpShelfZeroOrderDTO.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/dto/UpShelfZeroOrderDTO.java @@ -18,4 +18,6 @@ public class UpShelfZeroOrderDTO implements Serializable { @ApiModelProperty(name = "库位id",notes = "库位id") private Long allocationId;//库位id + private Integer num;//总数 + } 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 f72d65f36..14bf9254d 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 @@ -21,6 +21,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.logpm.warehouse.entity.WarehouseUpdownGoodsEntity; import com.logpm.warehouse.excel.WarehouseUpdownGoodsExcel; +import com.logpm.warehouse.vo.ParcelListVO; import com.logpm.warehouse.vo.PositionVO; import com.logpm.warehouse.vo.UpShelfDataVO; import com.logpm.warehouse.vo.WarehouseUpdownGoodsVO; @@ -89,6 +90,9 @@ public interface WarehouseUpdownGoodsMapper extends BaseMapper + + + 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 cee060b59..b97b77955 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 @@ -27,7 +27,7 @@ public interface IWarehouseTrayTypeService extends BaseService getZeroOrderByWaybillCode(String waybillCode,Long warehouseId); - R enterZeroOrderByTrayCode(String trayType ,String trayCode, List zeroList); + R enterZeroOrderByTrayCode(String trayType ,String trayCode, List zeroList,Long warehouseId); R deleteZeroOrderByTrayCode(String orderCode, String trayCode); 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 d40d4acdd..644370b95 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 @@ -22,6 +22,7 @@ import com.logpm.distribution.entity.DistributionParcelListEntity; import com.logpm.warehouse.entity.WarehouseUpdownGoodsEntity; import com.logpm.warehouse.entity.WarehouseUpdownTypeEntity; import com.logpm.warehouse.excel.WarehouseUpdownGoodsExcel; +import com.logpm.warehouse.vo.ParcelListVO; import com.logpm.warehouse.vo.PositionVO; import com.logpm.warehouse.vo.UpShelfDataVO; import com.logpm.warehouse.vo.WarehouseUpdownGoodsVO; @@ -123,4 +124,7 @@ public interface IWarehouseUpdownGoodsService extends BaseService getZeroOrderListByWaybillNumber(String waybillNumber,Long warehouseId); Integer getNumByZation(Long id); + + ParcelListVO findAllUpShelfDataByOrderCode(String orderCode); + } 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 599e59a14..e531e0741 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 @@ -5,10 +5,7 @@ import com.logpm.warehouse.dto.UpShelfPackageDTO; import com.logpm.warehouse.dto.UpShelfStockDTO; import com.logpm.warehouse.dto.UpShelfZeroOrderDTO; import com.logpm.warehouse.entity.WarehouseUpdownTypeEntity; -import com.logpm.warehouse.vo.MovePackInfoVO; -import com.logpm.warehouse.vo.TragetAllocationVO; -import com.logpm.warehouse.vo.UpShelfAllocationVO; -import com.logpm.warehouse.vo.UpShelfDataVO; +import com.logpm.warehouse.vo.*; import org.springblade.core.mp.base.BaseService; import org.springblade.core.tool.api.R; @@ -61,4 +58,7 @@ public interface IWarehouseUpdownTypeService extends BaseService zeroList) { + public R enterZeroOrderByTrayCode(String trayType,String trayCode, List zeroList,Long warehouseId) { if(Objects.isNull(zeroList)){ log.warn("##############enterZeroOrderByTrayCode: 数据为空 zeroList={}",zeroList); return R.fail(403,"数据为空"); @@ -736,7 +736,7 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl updownGoodsList, int residue, String bindingType, Integer isAlltrays, String remark) { List updownGoodsLogList = new ArrayList<>();