|
@@ -93,7 +93,7 @@ public class UnloadingWeighHandler extends AbstractWaybillOrderHandler<WaybillOr
|
|
|
updateGatekeeperOrderStatus(waybillOrder);
|
|
updateGatekeeperOrderStatus(waybillOrder);
|
|
|
|
|
|
|
|
// 3.创建卸货过磅记录
|
|
// 3.创建卸货过磅记录
|
|
|
- createWeighbridges(waybillOrder);
|
|
|
|
|
|
|
+ createWeighbridges(param, waybillOrder);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -130,7 +130,7 @@ public class UnloadingWeighHandler extends AbstractWaybillOrderHandler<WaybillOr
|
|
|
* 创建卸货过磅记录
|
|
* 创建卸货过磅记录
|
|
|
* @param waybillOrder
|
|
* @param waybillOrder
|
|
|
*/
|
|
*/
|
|
|
- private void createWeighbridges(KwtWaybillOrder waybillOrder) {
|
|
|
|
|
|
|
+ private void createWeighbridges(WaybillOrderUnloadingWeighParam param,KwtWaybillOrder waybillOrder) {
|
|
|
CompletableFuture.runAsync(() ->{
|
|
CompletableFuture.runAsync(() ->{
|
|
|
try {
|
|
try {
|
|
|
log.debug("开始异步保存地磅记录,运单ID:{}", waybillOrder.getId());
|
|
log.debug("开始异步保存地磅记录,运单ID:{}", waybillOrder.getId());
|
|
@@ -140,8 +140,8 @@ public class UnloadingWeighHandler extends AbstractWaybillOrderHandler<WaybillOr
|
|
|
weighbridge.setTruckId(waybillOrder.getTruckId());
|
|
weighbridge.setTruckId(waybillOrder.getTruckId());
|
|
|
weighbridge.setTruckNo(waybillOrder.getTruckNo());
|
|
weighbridge.setTruckNo(waybillOrder.getTruckNo());
|
|
|
weighbridge.setType(WeighbridgeTypeEnum.UNLOADING.getCode());
|
|
weighbridge.setType(WeighbridgeTypeEnum.UNLOADING.getCode());
|
|
|
- weighbridge.setWeighbridgeId(10001l);
|
|
|
|
|
- weighbridge.setWeight(BigDecimal.ZERO);
|
|
|
|
|
|
|
+ weighbridge.setWeighbridgeId(param.getWeighbridgeId());
|
|
|
|
|
+ weighbridge.setWeight(param.getWeighAmount());
|
|
|
weighbridge.setWeighUrl(null);
|
|
weighbridge.setWeighUrl(null);
|
|
|
weighbridge.setCreateTime(new Date());
|
|
weighbridge.setCreateTime(new Date());
|
|
|
weighbridge.setCreateUser(waybillOrder.getDriverId());
|
|
weighbridge.setCreateUser(waybillOrder.getDriverId());
|
|
@@ -169,7 +169,7 @@ public class UnloadingWeighHandler extends AbstractWaybillOrderHandler<WaybillOr
|
|
|
updateTareAmount(param, waybillOrder, takeTicket);
|
|
updateTareAmount(param, waybillOrder, takeTicket);
|
|
|
|
|
|
|
|
// 2.创建卸货过磅记录
|
|
// 2.创建卸货过磅记录
|
|
|
- createWeighbridges(waybillOrder);
|
|
|
|
|
|
|
+ createWeighbridges(param, waybillOrder);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
/**
|