|
@@ -115,7 +115,7 @@ public class ComeIntoHandler extends AbstractWaybillOrderHandler<WaybillOrderCme
|
|
|
createForkliftWaybill(waybillOrder);
|
|
createForkliftWaybill(waybillOrder);
|
|
|
|
|
|
|
|
//5.创建过磅记录
|
|
//5.创建过磅记录
|
|
|
- createWeighbridges(waybillOrder);
|
|
|
|
|
|
|
+ createWeighbridges(param, waybillOrder);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -228,7 +228,7 @@ public class ComeIntoHandler extends AbstractWaybillOrderHandler<WaybillOrderCme
|
|
|
* 创建过磅记录
|
|
* 创建过磅记录
|
|
|
* @param waybillOrder
|
|
* @param waybillOrder
|
|
|
*/
|
|
*/
|
|
|
- private void createWeighbridges(KwtWaybillOrder waybillOrder) {
|
|
|
|
|
|
|
+ private void createWeighbridges(WaybillOrderCmeIntoWeighParam param, KwtWaybillOrder waybillOrder) {
|
|
|
CompletableFuture.runAsync(() ->{
|
|
CompletableFuture.runAsync(() ->{
|
|
|
try {
|
|
try {
|
|
|
log.debug("开始异步保存地磅记录,运单ID:{}", waybillOrder.getId());
|
|
log.debug("开始异步保存地磅记录,运单ID:{}", waybillOrder.getId());
|
|
@@ -238,8 +238,8 @@ public class ComeIntoHandler extends AbstractWaybillOrderHandler<WaybillOrderCme
|
|
|
weighbridge.setTruckId(waybillOrder.getTruckId());
|
|
weighbridge.setTruckId(waybillOrder.getTruckId());
|
|
|
weighbridge.setTruckNo(waybillOrder.getTruckNo());
|
|
weighbridge.setTruckNo(waybillOrder.getTruckNo());
|
|
|
weighbridge.setType(WeighbridgeTypeEnum.LOADING.getCode());
|
|
weighbridge.setType(WeighbridgeTypeEnum.LOADING.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());
|
|
@@ -270,7 +270,7 @@ public class ComeIntoHandler extends AbstractWaybillOrderHandler<WaybillOrderCme
|
|
|
//3.判断流程
|
|
//3.判断流程
|
|
|
checkProcess(param, waybillOrder, loadAmount);
|
|
checkProcess(param, waybillOrder, loadAmount);
|
|
|
//4.创建过磅记录
|
|
//4.创建过磅记录
|
|
|
- createWeighbridges(waybillOrder);
|
|
|
|
|
|
|
+ createWeighbridges(param, waybillOrder);
|
|
|
|
|
|
|
|
}
|
|
}
|
|
|
|
|
|