Sfoglia il codice sorgente

运单详情接口,新增卸货皮重毛重

donglang 1 mese fa
parent
commit
165ecbfa6d

+ 12 - 0
sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/vo/WaybillOrderDetailResp.java

@@ -159,6 +159,18 @@ public class WaybillOrderDetailResp implements Serializable {
     @Schema(description = "毛重")
     private BigDecimal grossAmount;
 
+    /**
+     * 皮重
+     */
+    @Schema(description = "卸货皮重")
+    private BigDecimal unloadingTareAmount;
+
+    /**
+     * 毛重
+     */
+    @Schema(description = "卸货毛重")
+    private BigDecimal unloadingGrossAmount;
+
     /**
      * 状态
      */

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

@@ -4608,6 +4608,13 @@ public class KwtWaybillOrderV1Service {
         KwtWaybillOrderTicket tareAmountTicket = ticketMap.getOrDefault(shipmentTicketKey, new KwtWaybillOrderTicket());
         resp.setTareAmount(tareAmountTicket.getTareAmount());
         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())){
             BigDecimal actualPrice = Objects.nonNull(logOrder.getPrice()) && Objects.nonNull(subtask.getLoadAmount()) ?
                     logOrder.getPrice().multiply(subtask.getLoadAmount()) : BigDecimal.ZERO;