|
|
@@ -521,6 +521,7 @@ public class ProjectBasicsService extends CrudService<ProjectBasicsMapper, Proje
|
|
|
String definitionNumber = detail.getProjectDefinitionNumber(); //项目定义编码
|
|
|
String courseName = detail.getCourseName();//科目名称
|
|
|
String wbsDesc = detail.getWbsDescription();//wbs描述
|
|
|
+ String costBreakDownName = detail.getCostBreakdownName();//费用明细
|
|
|
String materialDesc = detail.getMaterialDescription();//物料描述
|
|
|
String postingDate = detail.getPostingDate();//过账日期
|
|
|
String suppliName = detail.getSupplierName();//供应商
|
|
|
@@ -550,7 +551,7 @@ public class ProjectBasicsService extends CrudService<ProjectBasicsMapper, Proje
|
|
|
if(("生产成本-外包材料费".equals(courseName)|| "生产成本-外包检修费".equals(courseName)
|
|
|
|| "生产成本-自营材料费".equals(courseName)|| "项目建设成本-成本".equals(courseName))
|
|
|
&& StringUtils.isBlank(materialDesc)
|
|
|
- && ("安装工程支出".equals(wbsDesc) || "建筑工程支出".equals(wbsDesc)||"安装工程".equals(wbsDesc)||"建筑工程".equals(wbsDesc))
|
|
|
+ && ("安装工程支出".equals(costBreakDownName) || "建筑工程支出".equals(costBreakDownName)||"安装工程".equals(costBreakDownName)||"建筑工程".equals(costBreakDownName))
|
|
|
&&StringUtils.isNotBlank(postingDate)){
|
|
|
if(basicsInfo == null){
|
|
|
basicsInfo = new ProjectBasicsInfo();
|
chengqiang