diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/WaybillOrder.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/WaybillOrder.java index 03edd7792..4b6004456 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/WaybillOrder.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/WaybillOrder.java @@ -85,6 +85,8 @@ public class WaybillOrder implements Serializable { private String timeType; /* 计泡比例 */ private String meterType; + /* 取重方式 */ + private String carryType; /* 快递产品类型 */ private String productType; @@ -499,6 +501,7 @@ public class WaybillOrder implements Serializable { voItem.setTimeType(dbWaybill.getTimeType()); voItem.setMeterType(dbWaybill.getMeterType()); + voItem.setCarryType(dbWaybill.getCarryType()); voItem.setCustomsClear(dbWaybill.getCustomsClear()); voItem.setCustomsEclaration(dbWaybill.getCustomsEclaration()); @@ -734,6 +737,7 @@ public class WaybillOrder implements Serializable { dbWaybill.setTimeType(this.getTimeType()); dbWaybill.setMeterType(this.getMeterType()); + dbWaybill.setCarryType(this.getCarryType()); dbWaybill.setCustomsClear(this.getCustomsClear()); dbWaybill.setCustomsEclaration(this.getCustomsEclaration()); 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 1be87fce0..981dc75e0 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 @@ -1892,6 +1892,7 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb // 获取泡重比 EmisTransLine emisTransLine = getTransLineByCode(emisWaybillSave.getTransLineType()); emisWaybillSave.setMeterType(emisTransLine.getMeterRate()); + emisWaybillSave.setCarryType(emisTransLine.getTransType()); // 时效 EmisTransProduct emisTransProduct = getTransProductByCode(emisWaybillSave.getProductType()); @@ -2111,7 +2112,6 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb emisWaybillSave.setRegisterDate(new Date()); } - // 寄件网点财务中心 if(isNew) { EmisSite sendSite = getSiteByCode(emisWaybillSave.getSendSiteCode()); @@ -2286,6 +2286,7 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb // 获取泡重比 EmisTransLine emisTransLine = getTransLineByCode(emisWaybillSave.getTransLineType()); emisWaybillSave.setMeterType(emisTransLine.getMeterRate()); + emisWaybillSave.setCarryType(emisTransLine.getTransType()); // 计算标准运费 List feeitemList=emisWaybillSave.getFeeitemList(); @@ -2667,6 +2668,7 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb // 获取泡重比 EmisTransLine emisTransLine = getTransLineByCode(emisWaybillSave.getTransLineType()); emisWaybillSave.setMeterType(emisTransLine.getMeterRate()); + emisWaybillSave.setCarryType(emisTransLine.getTransType()); // 计算标准运费 List feeitemList=emisWaybillSave.getFeeitemList(); @@ -3811,6 +3813,7 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb } emisWaybill.setVolumeWeight(BigDecimal.valueOf(volumeWeight)); emisWaybill.setMeterType(emisTransLine.getMeterRate()); + emisWaybill.setCarryType(emisTransLine.getTransType()); } @Override