aike/emis-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

md

Browse Source
This commit is contained in:
linfso 2024-05-12 02:16:03 +08:00
parent 722c36a6b7
commit 31789e174d
1 changed files with 3 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java
View File

@ -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());
}