|
|
@@ -103,7 +103,7 @@ public class TakingOrderHandler extends AbstractWaybillOrderHandler<OrderCircula
|
|
|
List<KwtWaybillOrderAddress> addresses = createWaybillOrderAddress(param, waybillOrder, waybillOrderSubtask);
|
|
|
|
|
|
//4、生成车辆运单-装卸货信息
|
|
|
- createWaybillOrderTicket(param, logOrder, waybillOrder, waybillOrderSubtask, addresses, truck);
|
|
|
+ createWaybillOrderTicket(param, logOrder, waybillOrder, waybillOrderSubtask, addresses);
|
|
|
|
|
|
//5、更新上游订单:回写物流订单
|
|
|
updateLogOrder(logOrder, truckLoadVolume);
|
|
|
@@ -426,17 +426,17 @@ public class TakingOrderHandler extends AbstractWaybillOrderHandler<OrderCircula
|
|
|
*/
|
|
|
private void createWaybillOrderTicket(OrderCirculateTakingQueryParam param, KwtLogisticsOrder logOrder,
|
|
|
KwtWaybillOrder waybillOrder, KwtWaybillOrderSubtask waybillOrderSubtask,
|
|
|
- List<KwtWaybillOrderAddress> waybillOrderAddresses, RTruckVo truckNo) {
|
|
|
+ List<KwtWaybillOrderAddress> waybillOrderAddresses) {
|
|
|
log.info("创建车辆运单-装卸货信息入参参数:{}", JSON.toJSONString(param));
|
|
|
|
|
|
//装货地址
|
|
|
KwtWaybillOrderAddress shipmentAddress = getWaybillOrderAddress(waybillOrderAddresses, AddressTypeEnum.SHIPMENT);
|
|
|
- createTicket(waybillOrder, waybillOrderSubtask, shipmentAddress, logOrder, truckNo);
|
|
|
+ createTicket(waybillOrder, waybillOrderSubtask, shipmentAddress, logOrder);
|
|
|
log.info("创建车辆运单-装卸货信息成功!");
|
|
|
|
|
|
//卸货地址
|
|
|
KwtWaybillOrderAddress takeAddress = getWaybillOrderAddress(waybillOrderAddresses, AddressTypeEnum.TAKE);
|
|
|
- createTicket(waybillOrder, waybillOrderSubtask, takeAddress, logOrder, truckNo);
|
|
|
+ createTicket(waybillOrder, waybillOrderSubtask, takeAddress, logOrder);
|
|
|
log.info("创建车辆运单-装卸货信息成功!");
|
|
|
|
|
|
}
|
|
|
@@ -463,16 +463,13 @@ public class TakingOrderHandler extends AbstractWaybillOrderHandler<OrderCircula
|
|
|
* @param shipmentAddress
|
|
|
*/
|
|
|
private void createTicket(KwtWaybillOrder waybillOrder, KwtWaybillOrderSubtask waybillOrderSubtask,
|
|
|
- KwtWaybillOrderAddress shipmentAddress, KwtLogisticsOrder logOrder, RTruckVo truckNo) {
|
|
|
+ KwtWaybillOrderAddress shipmentAddress, KwtLogisticsOrder logOrder) {
|
|
|
KwtWaybillOrderTicket ticket = new KwtWaybillOrderTicket();
|
|
|
ticket.setWOrderId(waybillOrder.getId());
|
|
|
ticket.setWSubtaskId(waybillOrderSubtask.getId());
|
|
|
ticket.setWAddressId(shipmentAddress.getId());
|
|
|
ticket.setType(shipmentAddress.getAddressType());
|
|
|
ticket.setUnit(logOrder.getUnit());
|
|
|
- ticket.setAmount(BigDecimal.ZERO);
|
|
|
- ticket.setGrossAmount(truckNo.getGrossWeight());
|
|
|
- ticket.setTareAmount(truckNo.getTareWeight());
|
|
|
ticket.setCreateBy(waybillOrder.getDriverId());
|
|
|
waybillOrderTicketRepository.save(ticket);
|
|
|
}
|