运单详情返回毛重

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/KwtWaybillOrderV1Service.java

@@ -4574,6 +4574,10 @@ public class KwtWaybillOrderV1Service {
                     contractGoodsDto.getPrice().multiply(subtask.getLoadAmount()) : BigDecimal.ZERO;
             resp.setActualPrice(actualPrice.setScale(2, RoundingMode.HALF_UP).toPlainString() +"元");
             resp.setActualGoodsPrice(actualGoodsPrice.setScale(2, RoundingMode.HALF_UP).toPlainString()+"元");
+            // 票据信息
+            String shipmentTicketKey = subtask.getWOrderId() + "-" + AddressTypeEnum.SHIPMENT.getCode();
+            KwtWaybillOrderTicket tareAmountTicket = ticketMap.getOrDefault(shipmentTicketKey, new KwtWaybillOrderTicket());
+            resp.setTareAmount(tareAmountTicket.getTareAmount());
         }else if (org.apache.commons.lang3.StringUtils.equals(logOrder.getBillingMode(), DictEnum.CHARGING_TYPE_2.getValue())){
             BigDecimal actualPrice = Objects.nonNull(logOrder.getPrice()) && Objects.nonNull(subtask.getUnloadAmount()) ?
                     logOrder.getPrice().multiply(subtask.getUnloadAmount()) : BigDecimal.ZERO;
@@ -4581,6 +4585,11 @@ public class KwtWaybillOrderV1Service {
                     contractGoodsDto.getPrice().multiply(subtask.getUnloadAmount()) : BigDecimal.ZERO;
             resp.setActualPrice(actualPrice.setScale(2, RoundingMode.HALF_UP).toPlainString()+"元");
             resp.setActualGoodsPrice(actualGoodsPrice.setScale(2, RoundingMode.HALF_UP).toPlainString()+"元");
+
+            String takeTicketKey = subtask.getWOrderId() + "-" + AddressTypeEnum.TAKE.getCode();
+            KwtWaybillOrderTicket grossAmountTicket = ticketMap.getOrDefault(takeTicketKey, new KwtWaybillOrderTicket());
+            resp.setGrossAmount(grossAmountTicket.getGrossAmount());
+
         }
         resp.setTruckNo(billOrder.getTruckNo());
         resp.setCarAxis(truck != null ? truck.getCarAxis() : "");
@@ -4634,14 +4643,6 @@ public class KwtWaybillOrderV1Service {
                     .ifPresent(x -> resp.setSupplyEntName(x.getFirmName()));
         }
 
-        // 票据信息
-        String shipmentTicketKey = subtask.getWOrderId() + "-" + AddressTypeEnum.SHIPMENT.getCode();
-        String takeTicketKey = subtask.getWOrderId() + "-" + AddressTypeEnum.TAKE.getCode();
-        KwtWaybillOrderTicket tareAmountTicket = ticketMap.getOrDefault(shipmentTicketKey, new KwtWaybillOrderTicket());
-        KwtWaybillOrderTicket grossAmountTicket = ticketMap.getOrDefault(takeTicketKey, new KwtWaybillOrderTicket());
-        resp.setTareAmount(tareAmountTicket.getTareAmount());
-        resp.setGrossAmount(grossAmountTicket.getGrossAmount());
-
         // 状态信息
         resp.setStatus(subtask.getStatus());
         resp.setStatusDesc(CarWaybillV1Enum.geDesc(subtask.getStatus()));