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-06-30 20:45:26 +08:00
parent 209b86aa9f
commit 972aa789da
1 changed files with 6 additions and 4 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

@ -716,9 +716,6 @@ public class EmisTmsCostFeeServiceImpl implements IEmisTmsCostFeeService
} }
/** /**
* 合并成本费用 * 合并成本费用
* @param billCode * @param billCode
@ -729,10 +726,15 @@ public class EmisTmsCostFeeServiceImpl implements IEmisTmsCostFeeService
@Transactional @Transactional
public int mergeCostFeeByBillCode(String billCode) throws EmisBizError { public int mergeCostFeeByBillCode(String billCode) throws EmisBizError {
String mainBillCode=billCode;
// 判断是虚拟单还是主单 // 判断是虚拟单还是主单
EmisWaybill emisWaybill=emisWaybillMapper.selectEmisWaybillByBillCode(billCode); EmisWaybill emisWaybill=emisWaybillMapper.selectEmisWaybillByBillCode(billCode);
// 如果是虚拟单则使用主单号
if("1".equals(emisWaybill.getBlVirtual()) ){
mainBillCode=emisWaybill.getMasterBillCode();
}
EmisTmsCostProfit emisTmsCostProfit=emisTmsCostProfitMapper.selectEmisTmsCostProfitByBillCode(billCode); EmisTmsCostProfit emisTmsCostProfit=emisTmsCostProfitMapper.selectEmisTmsCostProfitByBillCode(mainBillCode);
if(emisTmsCostProfit==null){ if(emisTmsCostProfit==null){
// 获取成本数据 // 获取成本数据
emisTmsCostProfit = new EmisTmsCostProfit(); emisTmsCostProfit = new EmisTmsCostProfit();