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

Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom

This commit is contained in:
大米 2024-05-27 18:43:41 +08:00
parent 69bf939bd9 760ae24a8e
commit cf5a77f583
6 changed files with 20 additions and 32 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;
// private String materialNoAndProjectType;

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

@ -385,12 +385,5 @@ public class BomNewEbomParentEntity implements Serializable {
@ApiModelProperty(value = "导入SAP时间")
private LocalDateTime sapTime;
/**
* SAP排序字符串
*/
@TableField(value = "sap_order_num")
@ApiModelProperty(value = "SAP排序字符串")
private String sapOrderNum;
private static final long serialVersionUID = 265246823929418418L;
}

2
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BomNewEbomParentVO.java
View File

@ -345,7 +345,7 @@ public class BomNewEbomParentVO extends BaseMaterialVO implements Serializable {
* SAP排序字符串
*/
@ApiModelProperty(value = "SAP排序字符串")
private String sapOrderNum;
private String sapOrderNum = "0040";
private List<BomNewEbomParentVO> childNodes = Collections.emptyList();

2
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java
View File

@ -414,6 +414,8 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
}
}
child.setChildBomRowId(child.getRowId());
child.setSapOrderNum(BomUtil.generateSapOrderNum(child.getProjectType(), child.getMaterialCategoryCode()
, "1010", child.getMaterialNo(), child.getBomExist()));
}
}
}

29
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomEdit.java
View File

@ -149,19 +149,24 @@ public class EBomEdit {
}
public static void checkVirtualPackage(BomNewEbomChildEntity child){
if (child.getMaterialName().contains(VirtualPackageTypeEnum.MAKING_PACKAGE.getConMaterialName())) {
child.setVirtualPartType(VirtualPackageTypeEnum.MAKING_PACKAGE.getValue());
child.setVirtualPartIs(1);
if (StrUtil.equals(child.getProjectType(), BomConstant.PROJECT_TYPE_TEMPORARY)) {
child.setVirtualPartType(VirtualPackageTypeEnum.UN_VIRTUAL_PACKAGE.getValue());
child.setVirtualPartIs(0);
} else {
if (child.getMaterialName().contains(VirtualPackageTypeEnum.MAKING_PACKAGE.getConMaterialName())) {
child.setVirtualPartType(VirtualPackageTypeEnum.MAKING_PACKAGE.getValue());
child.setVirtualPartIs(1);
} else if (child.getMaterialName().contains(VirtualPackageTypeEnum.DELIVERY_PACKAGE.getConMaterialName())) {
child.setVirtualPartType(VirtualPackageTypeEnum.DELIVERY_PACKAGE.getValue());
child.setVirtualPartIs(1);
} else if (child.getMaterialName().contains(VirtualPackageTypeEnum.DIRECT_DELIVERY_PACKAGE.getConMaterialName())) {
child.setVirtualPartType(VirtualPackageTypeEnum.DIRECT_DELIVERY_PACKAGE.getValue());
child.setVirtualPartIs(1);
} else if (child.getMaterialName().contains(VirtualPackageTypeEnum.PRE_ASSEMBLY_PACKAGE.getConMaterialName())) {
child.setVirtualPartType(VirtualPackageTypeEnum.PRE_ASSEMBLY_PACKAGE.getValue());
child.setVirtualPartIs(1);
} else if (child.getMaterialName().contains(VirtualPackageTypeEnum.DELIVERY_PACKAGE.getConMaterialName())) {
child.setVirtualPartType(VirtualPackageTypeEnum.DELIVERY_PACKAGE.getValue());
child.setVirtualPartIs(1);
} else if (child.getMaterialName().contains(VirtualPackageTypeEnum.DIRECT_DELIVERY_PACKAGE.getConMaterialName())) {
child.setVirtualPartType(VirtualPackageTypeEnum.DIRECT_DELIVERY_PACKAGE.getValue());
child.setVirtualPartIs(1);
} else if (child.getMaterialName().contains(VirtualPackageTypeEnum.PRE_ASSEMBLY_PACKAGE.getConMaterialName())) {
child.setVirtualPartType(VirtualPackageTypeEnum.PRE_ASSEMBLY_PACKAGE.getValue());
child.setVirtualPartIs(1);
}
}
}

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();
@ -431,8 +428,6 @@ public class OriginalBomToEBomV2Convert extends BaseConvert {
// childEntity.setDrawingNo(childEntity.getMaterialNo());
// }
childEntity.setMaterialOriginalUnit(childEntity.getMaterialUnit());
childEntity.setSapOrderNum(BomUtil.generateSapOrderNum(childEntity.getProjectType()
, childEntity.getMaterialCategoryCode(), "1010", childEntity.getMaterialNo(), 0));
this.eBomChildResult.add(childEntity);