rakor
/
nflg_project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition 

# Conflicts:
#	nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/entity/BomNewEbomParentEntity.java
#	nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/OriginalBomToEBomV2Convert.java
This commit is contained in:
曹鹏飞 2024-05-27 11:03:46 +08:00
parent 71749f0a2b 760ae24a8e
commit e17e901470
3 changed files with 0 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/entity/BomNewEbomChildEntity.java
View File

@ -224,13 +224,6 @@ public class BomNewEbomChildEntity implements Serializable {
@ApiModelProperty(value = "原始单位-来自cad")
private String materialOriginalUnit;
/**
* SAP排序字符串
*/
@TableField(value = "sap_order_num")
@ApiModelProperty(value = "SAP排序字符串")
private String sapOrderNum;
@TableField(value = "initial_parent_row_id")
@ApiModelProperty(value = "刚转过来或刚导入时的父行ID")

7
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/entity/BomNewEbomParentEntity.java
View File

@ -385,13 +385,6 @@ public class BomNewEbomParentEntity implements Serializable {
@ApiModelProperty(value = "导入SAP时间")
private LocalDateTime sapTime;
/**
* SAP排序字符串
*/
@TableField(value = "sap_order_num")
@ApiModelProperty(value = "SAP排序字符串")
private String sapOrderNum;
@TableField(exist = false)
private boolean isImportRoot = false;

5
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/OriginalBomToEBomV2Convert.java
View File

@ -24,7 +24,6 @@ import com.nflg.product.bomnew.service.BomNewEbomParentService;
import com.nflg.product.bomnew.service.MaterialMainService;
import com.nflg.product.bomnew.service.UserRoleService;
import com.nflg.product.bomnew.service.cache.MaterialMateCache;
import com.nflg.product.bomnew.util.BomUtil;
import com.nflg.product.bomnew.util.ListCommonUtil;
import com.nflg.product.bomnew.util.VUtils;
import com.nflg.product.bomnew.util.VersionUtil;
@ -388,8 +387,6 @@ public class OriginalBomToEBomV2Convert extends BaseConvert {
this.eBomParentResult.add(ebom);
}
eBomParent.setMaterialOriginalUnit(eBomParent.getMaterialUnit());
eBomParent.setSapOrderNum(BomUtil.generateSapOrderNum(parentEnt.getProjectType(), parentEnt.getMaterialCategoryCode()
, "1010", parentEnt.getMaterialNo(), parentEnt.getBomExist()));
this.eBomParentResult.add(eBomParent);
return eBomParent.getRowId();
@ -432,8 +429,6 @@ public class OriginalBomToEBomV2Convert extends BaseConvert {
// }
childEntity.setMaterialOriginalUnit(childEntity.getMaterialUnit());
childEntity.setInitialParentRowId(parent.getEBomRowId());
childEntity.setSapOrderNum(BomUtil.generateSapOrderNum(childEntity.getProjectType()
, childEntity.getMaterialCategoryCode(), "1010", childEntity.getMaterialNo(), 0));
this.eBomChildResult.add(childEntity);