|
@@ -4608,6 +4608,13 @@ public class KwtWaybillOrderV1Service {
|
|
|
KwtWaybillOrderTicket tareAmountTicket = ticketMap.getOrDefault(shipmentTicketKey, new KwtWaybillOrderTicket());
|
|
KwtWaybillOrderTicket tareAmountTicket = ticketMap.getOrDefault(shipmentTicketKey, new KwtWaybillOrderTicket());
|
|
|
resp.setTareAmount(tareAmountTicket.getTareAmount());
|
|
resp.setTareAmount(tareAmountTicket.getTareAmount());
|
|
|
resp.setGrossAmount(tareAmountTicket.getGrossAmount());
|
|
resp.setGrossAmount(tareAmountTicket.getGrossAmount());
|
|
|
|
|
+
|
|
|
|
|
+ // 卸货票据信息
|
|
|
|
|
+ String unloadShipmentTicketKey = subtask.getWOrderId() + "-" + AddressTypeEnum.TAKE.getCode();
|
|
|
|
|
+ KwtWaybillOrderTicket unloadTareAmountTicket = ticketMap.getOrDefault(unloadShipmentTicketKey, new KwtWaybillOrderTicket());
|
|
|
|
|
+ resp.setUnloadingTareAmount(unloadTareAmountTicket.getTareAmount());
|
|
|
|
|
+ resp.setUnloadingGrossAmount(unloadTareAmountTicket.getGrossAmount());
|
|
|
|
|
+
|
|
|
if (org.apache.commons.lang3.StringUtils.equals(logOrder.getBillingMode(), DictEnum.CHARGING_TYPE_1.getValue())){
|
|
if (org.apache.commons.lang3.StringUtils.equals(logOrder.getBillingMode(), DictEnum.CHARGING_TYPE_1.getValue())){
|
|
|
BigDecimal actualPrice = Objects.nonNull(logOrder.getPrice()) && Objects.nonNull(subtask.getLoadAmount()) ?
|
|
BigDecimal actualPrice = Objects.nonNull(logOrder.getPrice()) && Objects.nonNull(subtask.getLoadAmount()) ?
|
|
|
logOrder.getPrice().multiply(subtask.getLoadAmount()) : BigDecimal.ZERO;
|
|
logOrder.getPrice().multiply(subtask.getLoadAmount()) : BigDecimal.ZERO;
|