|
|
@@ -64,6 +64,7 @@ public class ErpInfo {
|
|
|
|
|
|
public final static String CON_PLPLPLQ=CON_PlPlQ+CON_lINE+CON_PES+CON_lINE+CON_PLPM+CON_lINE+CON_OTR;//工程成本-待摊支出-项目法人管理费-其他
|
|
|
public final static String CON_PLPLPLQ1 = "工程成本-待摊支出-法人管理费-其他";//工程成本-待摊支出-法人管理费-其他
|
|
|
+ public final static String CON_PLPLPLQ2 = "工程成本-待摊支出-项目法人管理费-其他";//工程成本-待摊支出-法人管理费-其他
|
|
|
public final static String CON_PLM=CON_PMF+CON_lINE+CON_METF;//项目管理经费 - 会议费
|
|
|
|
|
|
public static Boolean getContains(Object object,Object object1){
|
|
|
@@ -423,6 +424,7 @@ public class ErpInfo {
|
|
|
if (erpAccount.getSubjectName().contains(ErpInfo.CON_PlPlQ)||
|
|
|
erpAccount.getSubjectName().contains(ErpInfo.CON_PLPLPLQ)||
|
|
|
erpAccount.getSubjectName().contains(ErpInfo.CON_PLM)||
|
|
|
+ erpAccount.getSubjectName().contains(ErpInfo.CON_PLPLPLQ2)||
|
|
|
erpAccount.getSubjectName().contains(ErpInfo.CON_PLPLPLQ1)){
|
|
|
//判断WBS描述为工程监理费
|
|
|
if (erpAccount.getWbsDetails().equals(ErpInfo.CON_PSF)){
|
|
|
@@ -452,6 +454,7 @@ public class ErpInfo {
|
|
|
if (erpAccount.getSubjectName().contains(ErpInfo.CON_PlPlQ)||
|
|
|
erpAccount.getSubjectName().contains(ErpInfo.CON_PLPLPLQ)||
|
|
|
erpAccount.getSubjectName().contains(ErpInfo.CON_PLM)||
|
|
|
+ erpAccount.getSubjectName().contains(ErpInfo.CON_PLPLPLQ2)||
|
|
|
erpAccount.getSubjectName().contains(ErpInfo.CON_PLPLPLQ1)){
|
|
|
//筛选（WBS描述）为工程监理费的行项目金额合计
|
|
|
if (erpAccount.getWbsDetails().equals(ErpInfo.CON_PSF)){
|
yue