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-07-08 04:45:23 +08:00
parent df17a6b04e
commit eb5f85960e
1 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsCostFeeServiceImpl.java
View File

@ -314,8 +314,8 @@ public class EmisTmsCostFeeServiceImpl extends EmisBaseService implements IEmisT
EmisTmsCostFeeSplit splitItem = new EmisTmsCostFeeSplit(); EmisTmsCostFeeSplit splitItem = new EmisTmsCostFeeSplit();
splitItem.setBillCode(mainBillCode); splitItem.setBillCode(mainBillCode.trim());
splitItem.setMainBillCode(mainBillCode); splitItem.setMainBillCode(mainBillCode.trim());
splitItem.setBillWeight(mainWaybill.getBillWeight()); // 运单重量 splitItem.setBillWeight(mainWaybill.getBillWeight()); // 运单重量
splitItem.setTotalVolume(mainWaybill.getTotalVolume()); // 运单体积 splitItem.setTotalVolume(mainWaybill.getTotalVolume()); // 运单体积
@ -408,8 +408,8 @@ public class EmisTmsCostFeeServiceImpl extends EmisBaseService implements IEmisT
){ ){
EmisTmsCostFeeSplit splitItem = new EmisTmsCostFeeSplit(); EmisTmsCostFeeSplit splitItem = new EmisTmsCostFeeSplit();
splitItem.setBillCode(mainBillCode); splitItem.setBillCode(mainBillCode.trim());
splitItem.setMainBillCode(mainBillCode); splitItem.setMainBillCode(mainBillCode.trim());
splitItem.setBillWeight(mainWaybill.getBillWeight()); // 运单重量 splitItem.setBillWeight(mainWaybill.getBillWeight()); // 运单重量
splitItem.setTotalVolume(mainWaybill.getTotalVolume()); // 运单体积 splitItem.setTotalVolume(mainWaybill.getTotalVolume()); // 运单体积
@ -509,8 +509,8 @@ public class EmisTmsCostFeeServiceImpl extends EmisBaseService implements IEmisT
EmisTmsCostFeeSplit splitItem = new EmisTmsCostFeeSplit(); EmisTmsCostFeeSplit splitItem = new EmisTmsCostFeeSplit();
splitItem.setBillCode(billCode); splitItem.setBillCode(billCode.trim());
splitItem.setMainBillCode(mainBillCode); splitItem.setMainBillCode(mainBillCode.trim());
splitItem.setBillWeight(waybill.getBillWeight()); // 运单重量 splitItem.setBillWeight(waybill.getBillWeight()); // 运单重量
splitItem.setTotalVolume(waybill.getTotalVolume()); // 运单体积 splitItem.setTotalVolume(waybill.getTotalVolume()); // 运单体积
@ -604,9 +604,9 @@ public class EmisTmsCostFeeServiceImpl extends EmisBaseService implements IEmisT
// 计算 机场提货费操作费 // 计算 机场提货费操作费
EmisTmsCostFeeSplit splitItem = new EmisTmsCostFeeSplit(); EmisTmsCostFeeSplit splitItem = new EmisTmsCostFeeSplit();
splitItem.setBillCode(billCode); splitItem.setBillCode(billCode.trim());
splitItem.setMainBillCode(mainBillCode); splitItem.setMainBillCode(mainBillCode.trim());
splitItem.setBillWeight(waybill.getBillWeight()); // 运单重量 splitItem.setBillWeight(waybill.getBillWeight()); // 运单重量
splitItem.setTotalVolume(waybill.getTotalVolume()); // 运单体积 splitItem.setTotalVolume(waybill.getTotalVolume()); // 运单体积
@ -922,8 +922,8 @@ public class EmisTmsCostFeeServiceImpl extends EmisBaseService implements IEmisT
for (EmisTmsCostFeeFeeitem feeItem: listFeeItemRel) { for (EmisTmsCostFeeFeeitem feeItem: listFeeItemRel) {
EmisTmsCostFeeSplit splitItem = new EmisTmsCostFeeSplit(); EmisTmsCostFeeSplit splitItem = new EmisTmsCostFeeSplit();
splitItem.setBillCode(billCode); splitItem.setBillCode(billCode.trim());
splitItem.setMainBillCode(mainBillCode); splitItem.setMainBillCode(mainBillCode.trim());
splitItem.setBillWeight(waybill.getBillWeight()); // 运单重量 splitItem.setBillWeight(waybill.getBillWeight()); // 运单重量
splitItem.setTotalVolume(waybill.getTotalVolume()); // 运单体积 splitItem.setTotalVolume(waybill.getTotalVolume()); // 运单体积
@ -1068,23 +1068,22 @@ public class EmisTmsCostFeeServiceImpl extends EmisBaseService implements IEmisT
@Transactional @Transactional
public void mergeCostFeeByBillCode(String billCode) throws EmisBizError { public void mergeCostFeeByBillCode(String billCode) throws EmisBizError {
String mainBillCode=billCode; String mainBillCode=billCode.trim();
// 判断是虚拟单还是主单 // 判断是虚拟单还是主单
EmisWaybill emisWaybill=emisTmsCostFeeMapper.selectThinWaybillInfoByCostFeeCalc(billCode); EmisWaybill emisWaybill=emisTmsCostFeeMapper.selectThinWaybillInfoByCostFeeCalc(billCode);
EmisWaybill mainEmisWaybill=emisWaybill; EmisWaybill mainEmisWaybill=emisWaybill;
// 如果是虚拟单则使用主单号 // 如果是虚拟单则使用主单号
if("1".equals(emisWaybill.getBlVirtual()) ){ if("1".equals(emisWaybill.getBlVirtual()) ){
mainBillCode=emisWaybill.getMasterBillCode(); mainBillCode=emisWaybill.getMasterBillCode().trim();
mainEmisWaybill=emisTmsCostFeeMapper.selectThinWaybillInfoByCostFeeCalc(mainBillCode); mainEmisWaybill=emisTmsCostFeeMapper.selectThinWaybillInfoByCostFeeCalc(mainBillCode);
} }
EmisTmsCostProfit emisTmsCostProfit=emisTmsCostProfitMapper.selectEmisTmsCostProfitByBillCode(mainBillCode); EmisTmsCostProfit emisTmsCostProfit=emisTmsCostProfitMapper.selectEmisTmsCostProfitByBillCode(mainBillCode);
if(emisTmsCostProfit==null){ if(emisTmsCostProfit==null){
// 获取成本数据 // 获取成本数据
emisTmsCostProfit = new EmisTmsCostProfit(); emisTmsCostProfit = new EmisTmsCostProfit();
emisTmsCostProfit.setBillCode(mainBillCode); emisTmsCostProfit.setBillCode(mainBillCode.trim());
emisTmsCostProfit.setBillFee(mainEmisWaybill.getFreight()); emisTmsCostProfit.setBillFee(mainEmisWaybill.getFreight());
emisTmsCostProfit.setStandardFee(mainEmisWaybill.getRealFee()); emisTmsCostProfit.setStandardFee(mainEmisWaybill.getRealFee());
emisTmsCostProfit.setCostFee(BigDecimal.ZERO); emisTmsCostProfit.setCostFee(BigDecimal.ZERO);