diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockupOrderListVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockupOrderListVO.java index d2eec0867..f030ce1e6 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockupOrderListVO.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockupOrderListVO.java @@ -33,6 +33,7 @@ public class DistributionStockupOrderListVO implements Serializable { private Integer scanNum;//扫描件数 private Long areaId; //货区id + private Long trayId; //托盘id private Long shelfId; //货架id private Long allocationId; //货位id diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionStockupAppController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionStockupAppController.java index 182dd7110..f8b69c243 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionStockupAppController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionStockupAppController.java @@ -183,41 +183,45 @@ public class DistributionStockupAppController extends BladeController { @ApiOperation(value = "客户订单列表", notes = "传入stockupDTO") public R orderInfo(@RequestBody StockupDTO stockupDTO) { log.info("##############orderInfo: {}",stockupDTO); +// Long reservationId = 1694647731085103105L;//预约单id +// Long stockArticleId = 1686560469463760898L;//订单id +// Long stockupId = 1694647730430791682L;//备货任务Id Long reservationId = stockupDTO.getReservationId();//预约单id Long stockArticleId = stockupDTO.getStockArticleId();//订单id - Long stockListId = stockupDTO.getStockListId();//库存品id - Integer orderStatus = stockupDTO.getOrderStatus();//1 客户订单 2库存品 - String allocation = stockupDTO.getAllocation(); - String pallet = stockupDTO.getPallet(); + Long stockupId = stockupDTO.getStockupId();//备货任务Id + Integer orderStatus = stockupDTO.getOrderStatus();//1 客户订单 2库存品 +// String allocation = stockupDTO.getAllocation(); + Long trayId = stockupDTO.getTrayId(); //托盘Id if(orderStatus.equals(1)){ //查询客户订单详情 - if(Objects.isNull(stockArticleId)){ - log.warn("##############orderInfo: 订单id为空 stockArticleId={}",stockArticleId); - return R.fail("订单id为空"); + if(Objects.isNull(reservationId)){ + log.warn("##############orderInfo: 预约id为空 stockArticleId={}",reservationId); + return R.fail(3002,"预约id为空"); } - if(StringUtil.isBlank(allocation)){ - log.warn("##############orderInfo: 库位为空 allocation={}",allocation); - return R.fail("库位为空"); + if(ObjectUtils.isNull(stockupId)){ + log.warn("##############orderInfo: 备货任务ID为空 allocation={}",stockupId); + return R.fail(3002,"备货任务Id为空"); } - if(StringUtil.isBlank(pallet)){ - log.warn("##############orderInfo: 托盘为空 pallet={}",pallet); - return R.fail("托盘为空"); + if(ObjectUtils.isNull(stockArticleId)){ + log.warn("##############orderInfo: 订单Id为空 pallet={}",stockArticleId); + return R.fail(3002,"订单Id为空"); } - - DistributionStockupOrderInfoVO infoVO = distributionStockupService.selectOrderInfo(reservationId,stockArticleId,allocation,pallet); + DistributionStockupOrderInfoVO infoVO = distributionStockupService.selectOrderInfo(reservationId,stockArticleId,stockupId,trayId); return R.data(infoVO); }else if(orderStatus.equals(2)){ + Long stockListId = stockupDTO.getStockListId();//库存品id + if(Objects.isNull(stockListId)){ log.warn("##############orderInfo: 库存品id为空 stockListId={}",stockListId); - return R.fail("库存品id为空"); + return R.fail(3002,"库存品id为空"); } DistributionStockupStockListInfoVO infoVO = distributionStockupService.selectStockListInfo(reservationId,stockListId); return R.data(infoVO); }else{ log.warn("##############orderInfo: 未知的查询类型 orderStatus={}",orderStatus); - return R.fail("未知的查询类型"); + return R.fail(3002,"未知的查询类型"); } } @@ -258,7 +262,7 @@ public class DistributionStockupAppController extends BladeController { return R.fail(3002,"预约Id不能为空"); } if(ObjectUtils.isNull(stockupDTO.getTrayId())){ - return R.fail(3002,"托盘码不能为空"); + return R.fail(3002,"托盘ID不能为空"); } R b = distributionStockupService.addPackTrayList(stockupDTO); return b; @@ -315,6 +319,8 @@ public class DistributionStockupAppController extends BladeController { String packetBarCode = stockupDTO.getPacketBarCode();//包件码 // String stockupArea = stockupDTO.getStockupArea();//备货区 Long stockupId = stockupDTO.getStockupId();//备货任务ID +// Long stockupId = Long.parseLong("1694647730430791682");//备货任务ID +// Long reservationId = Long.parseLong("1694649954590613505");//预约单id Long reservationId = stockupDTO.getReservationId();//预约单id if(StringUtil.isBlank(orderCode)){ log.warn("##################stockupScan: 包件扫码，订单自编号为空"); @@ -350,6 +356,16 @@ public class DistributionStockupAppController extends BladeController { map.put("logId", entity.getId()); map.put("messageData", entity); map.put("createTime", new Date().getTime()); +// Integer scanType = (Integer) map.get("scanType"); + DistributionStockEntity distributionStockEntity = (DistributionStockEntity) map.get("messageData"); + //根据扫码类型处理不同的数据 + if(scanType == 1){ + distributionStockService.repairPackageScanInfo(distributionStockEntity); + }else if(scanType == 2){ + distributionStockService.repairStockListScanInfo(distributionStockEntity); + }else{ + log.warn("################stockupScanHandler: 未知的扫码类型 scanType={}",scanType); + } //将消息携带绑定键值 rabbitTemplate.convertAndSend(RabbitConstant.STOCKUP_SCAN_EXCHANGE, RabbitConstant.STOCKUP_SCAN_ROUTING, map); diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.java index 04acd2ab9..f8b0a053e 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.java @@ -16,7 +16,6 @@ */ package com.logpm.distribution.mapper; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.logpm.distribution.entity.DistributionParcelListEntity; import com.logpm.distribution.vo.DistributionParcelListBaseVO; import com.logpm.distribution.vo.DistributionParcelListVO; @@ -56,7 +55,7 @@ public interface DistributionParcelListMapper extends BaseMapper selectOrderInfoList(@Param("reservationId") Long reservationId, @Param("stockArticleId") Long stockArticleId, @Param("allocation") String allocation, @Param("pallet") String pallet); + List selectOrderInfoList(@Param("reservationId") Long reservationId, @Param("stockArticleId") Long stockArticleId, @Param("stockupId") Long stockupId,@Param("trayId") Long trayId); List selectWarehouseAreaByReservationId(@Param("reservationId") Long reservationId); diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml index d4526ffc9..644e51db1 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml @@ -85,7 +85,7 @@