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

EBOM编辑，21物料生成发货包，发货前装配包命名规则和分类代码修改

This commit is contained in:
10001392 2024-07-11 09:51:24 +08:00
parent 8548f82c67
commit 8122ebdd8a
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -13,7 +13,7 @@ public enum VirtualPackageTypeEnum implements ValueEnum<Integer>{
DELIVERY_PACKAGE(1,"发货包","发货" ,"201101", "",1),
MAKING_PACKAGE(2,"制作包","制作","201101","",2),
DIRECT_DELIVERY_PACKAGE(4,"直发包","直发","201101","F",4),
PRE_ASSEMBLY_PACKAGE(8,"发货前装配包","发货前装配","200601","Z",8),
PRE_ASSEMBLY_PACKAGE(8,"发货前装配包","发货前装配","201101","Z",8),
PAINT_PACKAGE(16, "油漆包", "油漆包", "201101", "", 16);
private final Integer value;

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

@ -134,11 +134,12 @@ public abstract class VirtualPackageBase {
for (BomNewEbomParentVO ch : child) {
for (VirtualPackageTypeEnum vpy : virtualPackageTypeEnums) {
String vDrawingNo;
if (vpy == VirtualPackageTypeEnum.PRE_ASSEMBLY_PACKAGE) {
// 20240711 发货前装配包，命名规则也一样
/*if (vpy == VirtualPackageTypeEnum.PRE_ASSEMBLY_PACKAGE) {
vDrawingNo = String.join("", parentDrawingNo, ".FHQ", "(", ch.getMaterialName(), ")", "(", vpy.getConMaterialName(), ")");
} else {
} else {*/
vDrawingNo = String.join("", "(", parentDrawingNo, ch.getMaterialName(), ")", "(", vpy.getConMaterialName(), ")");
}
//}
vDrawingNoSet.add(vDrawingNo);
}
}
@ -151,11 +152,12 @@ public abstract class VirtualPackageBase {
for (BomNewEbomParentVO ch : child) {
for (VirtualPackageTypeEnum vpy : virtualPackageTypeEnums) {
String vDrawingNo;
if (vpy == VirtualPackageTypeEnum.PRE_ASSEMBLY_PACKAGE) {
// 20240711 发货前装配包，命名规则也一样
/*if (vpy == VirtualPackageTypeEnum.PRE_ASSEMBLY_PACKAGE) {
vDrawingNo = String.join("", parentDrawingNo, ".FHQ", "(", ch.getMaterialName(), ")", "(", vpy.getConMaterialName(), ")");
} else {
} else {*/
vDrawingNo = String.join("", "(", parentDrawingNo, ch.getMaterialName(), ")", "(", vpy.getConMaterialName(), ")");
}
//}
params.add(buildAddMaterialParamDo(StrUtil.join("", ch.getRowId().toString(), vpy.getConMaterialName()), vDrawingNo, vDrawingNo, vpy, oldMaterialMap));
}
}