|
|
|
@ -1535,30 +1535,16 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService {
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
if (Func.isNotEmpty(brand.get("欧派"))) { |
|
|
|
|
|
|
|
|
|
// 重新筛选出欧派的包件
|
|
|
|
|
for (DistributionReservationStockarticleEntity distributionReservationStockarticleEntity : distributionReservationStockarticleEntities) { |
|
|
|
|
|
|
|
|
|
// 查询预约单下面的包件信息
|
|
|
|
|
log.info(">>>>>>>>>>>>>>>>>>>>> 欧派循环包件信息 {} ", distributionReservationStockarticleEntity); |
|
|
|
|
List<DistributionParcelListEntity> distributionParcelListEntities = buildOpByReservationId(distributionReservationStockarticleEntity); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
for (DistributionParcelListEntity distributionParcelListEntity : distributionParcelListEntities) { |
|
|
|
|
// todo 查询签收信息
|
|
|
|
|
DistributionSignforEntity distributionSignfor = distributionSignforMapper.getByReservationId(distributionReservationStockarticleEntity.getReservationId()); |
|
|
|
|
List<MtReceiveContentDTO> oupai = brand.get("欧派"); |
|
|
|
|
for (MtReceiveContentDTO mtReceiveContentDTO : oupai) { |
|
|
|
|
OrderStatusDTO orderStatusDTO = new OrderStatusDTO(); |
|
|
|
|
orderStatusDTO.setUnitNo(distributionParcelListEntity.getOrderPackageCode()); //单号
|
|
|
|
|
orderStatusDTO.setUsername(distributionSignfor.getSigneeName()); //操作人名称
|
|
|
|
|
orderStatusDTO.setUnitNo(mtReceiveContentDTO.getUnitNo()); //包条
|
|
|
|
|
orderStatusDTO.setUsername(distributionSignforEntity.getSigneeName()); //操作人名称
|
|
|
|
|
orderStatusDTO.setStatus("7"); |
|
|
|
|
orderStatusDTO.setOperationTime(distributionSignfor.getSigningTime()); //时间
|
|
|
|
|
orderStatusDTO.setOperationTime(distributionSignforEntity.getSigningTime()); //时间
|
|
|
|
|
ouPaiFactoryClinet.newSystemHandleStatusData(orderStatusDTO); |
|
|
|
|
log.info(">>>>>>>>>>>>>>>>>进入newSystemHandleStatusData orderStatusDTO值 :{}", orderStatusDTO); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
// orderMainClinet.sendReceiveInfoByNewSystem(mtReceiveDTO);
|
|
|
|
|
} |
|
|
|
|
if (Func.isNotEmpty(brand.get("志邦"))) { |
|
|
|
|
List<MtReceiveContentDTO> zb = brand.get("志邦"); |
|
|
|
|
List<Object> contents = new ArrayList<>(); |
|
|
|
|