|
@@ -530,7 +530,7 @@ public class ErpInfo {
|
|
erpCredit.setOtherSupervisorFee(otherSupervisorFee);
|
|
erpCredit.setOtherSupervisorFee(otherSupervisorFee);
|
|
}
|
|
}
|
|
//判断WBS描述为工程设计费
|
|
//判断WBS描述为工程设计费
|
|
- if (erpAccount.getWbsDetails().equals(ErpInfo.CON_EDF)){
|
|
|
|
|
|
+ if (erpAccount.getWbsDetails().equals(ErpInfo.CON_EDF)||erpAccount.getWbsDetails().contains(ErpInfo.CON_PLMDESIGN)){
|
|
otherDesignFee = erpCredit.getOtherDesignFee() + lineItemAmount;//设计费
|
|
otherDesignFee = erpCredit.getOtherDesignFee() + lineItemAmount;//设计费
|
|
erpCredit.setOtherDesignFee(otherDesignFee);
|
|
erpCredit.setOtherDesignFee(otherDesignFee);
|
|
}
|
|
}
|