From 31789e174d72ae17db925b082a36b63b0933359e Mon Sep 17 00:00:00 2001 From: linfso Date: Sun, 12 May 2024 02:16:03 +0800 Subject: [PATCH] md --- .../service/impl/EmisWaybillServiceImpl.java | 23 +++---------------- 1 file changed, 3 insertions(+), 20 deletions(-) diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java index 0e3c9d3c1..7d0b74b84 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java @@ -569,7 +569,7 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb if ( StringUtils.isEmpty(emisWaybill.getProductType()) || emisWaybill.getBillWeight() == null - || emisWaybill.getTotalVolume() == null + || emisWaybill.getVolumeWeight() == null ) { @@ -577,34 +577,17 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb } double billWeight=emisWaybill.getBillWeight().doubleValue(); - double totalVolume=emisWaybill.getTotalVolume().doubleValue(); + double volumeWeight=emisWaybill.getVolumeWeight().doubleValue(); // 获取产品信息 EmisTransProduct emisTransProduct = getTransProductByCode(emisWaybill.getProductType()); - - // 获取泡重比,计算体积重量 - EmisTransLine emisTransLine= getTransLineByCode(emisTransProduct.getTransLineCode()); - - double volumeWeight=0.0D; - if(!StringUtils.isEmpty(emisTransLine.getMeterRate())) { - volumeWeight=totalVolume * (1000000 / Double.valueOf(emisTransLine.getMeterRate())); - DecimalFormat df = new DecimalFormat("#.#####"); - volumeWeight= Double.parseDouble(df.format(volumeWeight)); - }else{ - volumeWeight=billWeight; - } - - emisWaybill.setVolumeWeight(BigDecimal.valueOf(volumeWeight)); - // 两则取大 + // 两者取大 double maxWeight = Math.max(billWeight,volumeWeight); // 取重方式 String carryType=emisTransProduct.getCarryType(); - double setteldWeight = WaybillHelper.calcSettledWeight(maxWeight,carryType); emisWaybill.setSettlementWeight(BigDecimal.valueOf(setteldWeight)); - emisWaybill.setMeterType(emisTransLine.getMeterRate()); - }