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 2025-01-06 10:08:18 +08:00
parent 6047edbd32
commit 78adc075b1
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/WaybillOrder.java
View File

@ -85,6 +85,8 @@ public class WaybillOrder implements Serializable {
private String timeType; private String timeType;
/* 计泡比例 */ /* 计泡比例 */
private String meterType; private String meterType;
/* 取重方式 */
private String carryType;
/* 快递产品类型 */ /* 快递产品类型 */
private String productType; private String productType;
@ -499,6 +501,7 @@ public class WaybillOrder implements Serializable {
voItem.setTimeType(dbWaybill.getTimeType()); voItem.setTimeType(dbWaybill.getTimeType());
voItem.setMeterType(dbWaybill.getMeterType()); voItem.setMeterType(dbWaybill.getMeterType());
voItem.setCarryType(dbWaybill.getCarryType());
voItem.setCustomsClear(dbWaybill.getCustomsClear()); voItem.setCustomsClear(dbWaybill.getCustomsClear());
voItem.setCustomsEclaration(dbWaybill.getCustomsEclaration()); voItem.setCustomsEclaration(dbWaybill.getCustomsEclaration());
@ -734,6 +737,7 @@ public class WaybillOrder implements Serializable {
dbWaybill.setTimeType(this.getTimeType()); dbWaybill.setTimeType(this.getTimeType());
dbWaybill.setMeterType(this.getMeterType()); dbWaybill.setMeterType(this.getMeterType());
dbWaybill.setCarryType(this.getCarryType());
dbWaybill.setCustomsClear(this.getCustomsClear()); dbWaybill.setCustomsClear(this.getCustomsClear());
dbWaybill.setCustomsEclaration(this.getCustomsEclaration()); dbWaybill.setCustomsEclaration(this.getCustomsEclaration());

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

@ -1892,6 +1892,7 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
// 获取泡重比 // 获取泡重比
EmisTransLine emisTransLine = getTransLineByCode(emisWaybillSave.getTransLineType()); EmisTransLine emisTransLine = getTransLineByCode(emisWaybillSave.getTransLineType());
emisWaybillSave.setMeterType(emisTransLine.getMeterRate()); emisWaybillSave.setMeterType(emisTransLine.getMeterRate());
emisWaybillSave.setCarryType(emisTransLine.getTransType());
// 时效 // 时效
EmisTransProduct emisTransProduct = getTransProductByCode(emisWaybillSave.getProductType()); EmisTransProduct emisTransProduct = getTransProductByCode(emisWaybillSave.getProductType());
@ -2111,7 +2112,6 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
emisWaybillSave.setRegisterDate(new Date()); emisWaybillSave.setRegisterDate(new Date());
} }
// 寄件网点财务中心 // 寄件网点财务中心
if(isNew) { if(isNew) {
EmisSite sendSite = getSiteByCode(emisWaybillSave.getSendSiteCode()); EmisSite sendSite = getSiteByCode(emisWaybillSave.getSendSiteCode());
@ -2286,6 +2286,7 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
// 获取泡重比 // 获取泡重比
EmisTransLine emisTransLine = getTransLineByCode(emisWaybillSave.getTransLineType()); EmisTransLine emisTransLine = getTransLineByCode(emisWaybillSave.getTransLineType());
emisWaybillSave.setMeterType(emisTransLine.getMeterRate()); emisWaybillSave.setMeterType(emisTransLine.getMeterRate());
emisWaybillSave.setCarryType(emisTransLine.getTransType());
// 计算标准运费 // 计算标准运费
List<EmisWaybillFeeitem> feeitemList=emisWaybillSave.getFeeitemList(); List<EmisWaybillFeeitem> feeitemList=emisWaybillSave.getFeeitemList();
@ -2667,6 +2668,7 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
// 获取泡重比 // 获取泡重比
EmisTransLine emisTransLine = getTransLineByCode(emisWaybillSave.getTransLineType()); EmisTransLine emisTransLine = getTransLineByCode(emisWaybillSave.getTransLineType());
emisWaybillSave.setMeterType(emisTransLine.getMeterRate()); emisWaybillSave.setMeterType(emisTransLine.getMeterRate());
emisWaybillSave.setCarryType(emisTransLine.getTransType());
// 计算标准运费 // 计算标准运费
List<EmisWaybillFeeitem> feeitemList=emisWaybillSave.getFeeitemList(); List<EmisWaybillFeeitem> feeitemList=emisWaybillSave.getFeeitemList();
@ -3811,6 +3813,7 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
} }
emisWaybill.setVolumeWeight(BigDecimal.valueOf(volumeWeight)); emisWaybill.setVolumeWeight(BigDecimal.valueOf(volumeWeight));
emisWaybill.setMeterType(emisTransLine.getMeterRate()); emisWaybill.setMeterType(emisTransLine.getMeterRate());
emisWaybill.setCarryType(emisTransLine.getTransType());
} }
@Override @Override