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-04 15:20:11 +08:00
parent cc4040bf06
commit f6d0b2fada
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1030,11 +1030,15 @@ public class EmisTmsCostFeeServiceImpl extends EmisBaseService implements IEmisT
public void mergeCostFeeByBillCode(String billCode) throws EmisBizError { public void mergeCostFeeByBillCode(String billCode) throws EmisBizError {
String mainBillCode=billCode; String mainBillCode=billCode;
// 判断是虚拟单还是主单 // 判断是虚拟单还是主单
EmisWaybill emisWaybill=emisTmsCostFeeMapper.selectThinWaybillInfoByCostFeeCalc(billCode); EmisWaybill emisWaybill=emisTmsCostFeeMapper.selectThinWaybillInfoByCostFeeCalc(billCode);
EmisWaybill mainEmisWaybill=emisWaybill;
// 如果是虚拟单则使用主单号 // 如果是虚拟单则使用主单号
if("1".equals(emisWaybill.getBlVirtual()) ){ if("1".equals(emisWaybill.getBlVirtual()) ){
mainBillCode=emisWaybill.getMasterBillCode(); mainBillCode=emisWaybill.getMasterBillCode();
mainEmisWaybill=emisTmsCostFeeMapper.selectThinWaybillInfoByCostFeeCalc(mainBillCode);
} }
EmisTmsCostProfit emisTmsCostProfit=emisTmsCostProfitMapper.selectEmisTmsCostProfitByBillCode(mainBillCode); EmisTmsCostProfit emisTmsCostProfit=emisTmsCostProfitMapper.selectEmisTmsCostProfitByBillCode(mainBillCode);
@ -1042,10 +1046,10 @@ public class EmisTmsCostFeeServiceImpl extends EmisBaseService implements IEmisT
// 获取成本数据 // 获取成本数据
emisTmsCostProfit = new EmisTmsCostProfit(); emisTmsCostProfit = new EmisTmsCostProfit();
emisTmsCostProfit.setBillCode(mainBillCode); emisTmsCostProfit.setBillCode(mainBillCode);
emisTmsCostProfit.setBillFee(emisWaybill.getFreight()); emisTmsCostProfit.setBillFee(mainEmisWaybill.getFreight());
emisTmsCostProfit.setStandardFee(emisWaybill.getRealFee()); emisTmsCostProfit.setStandardFee(mainEmisWaybill.getRealFee());
emisTmsCostProfit.setCostFee(BigDecimal.ZERO); emisTmsCostProfit.setCostFee(BigDecimal.ZERO);
emisTmsCostProfit.setBillProfit(emisWaybill.getFreight()); emisTmsCostProfit.setBillProfit(mainEmisWaybill.getFreight());
emisTmsCostProfitMapper.insertEmisTmsCostProfit(emisTmsCostProfit); emisTmsCostProfitMapper.insertEmisTmsCostProfit(emisTmsCostProfit);
} }