Browse Source

feat(all): 修改干线卸车卸车确认回传逻辑

1 卸车和卸车确认回传增加运单号
visual
zhaoqiaobo 3 months ago
parent
commit
964b176bf1
  1. 2
      blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java

2
blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java

@ -522,6 +522,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
.content(value.stream().map(data->{ .content(value.stream().map(data->{
return PushData.builder() return PushData.builder()
.packageCode(data.getPackageCode()) .packageCode(data.getPackageCode())
.waybillNumber(data.getWaybillNumber())
.warehouseName(warehouseEntity.getName()) .warehouseName(warehouseEntity.getName())
.orderCode(data.getOrderCode()) .orderCode(data.getOrderCode())
.build(); .build();
@ -9552,6 +9553,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
.content(Collections.singletonList(PushData.builder() .content(Collections.singletonList(PushData.builder()
.packageCode(orderPackageCode) .packageCode(orderPackageCode)
.warehouseName(warehouseName) .warehouseName(warehouseName)
.waybillNumber(parcelListEntity.getWaybillNumber())
.destinationWarehouse(ObjectUtil.isNotEmpty(parcelListEntity) ? parcelListEntity.getAcceptWarehouseName():"") .destinationWarehouse(ObjectUtil.isNotEmpty(parcelListEntity) ? parcelListEntity.getAcceptWarehouseName():"")
.waybillStartWarehouse(ObjectUtil.isNotEmpty(parcelListEntity) ? parcelListEntity.getSendWarehouseName():"") .waybillStartWarehouse(ObjectUtil.isNotEmpty(parcelListEntity) ? parcelListEntity.getSendWarehouseName():"")
.orderCode(orderCode) .orderCode(orderCode)

Loading…
Cancel
Save