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-06-03 15:49:16 +08:00
parent 1011bda857 57957fff26
commit e99aa8e17f
2 changed files with 11 additions and 1 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/EBomConstant.java
View File

@ -31,6 +31,8 @@ public class EBomConstant {
public static final String PROJECT_TYPE_T="T"; public static final String PROJECT_TYPE_T="T";
public static final String KG="KG";
@AllArgsConstructor @AllArgsConstructor
@Getter @Getter

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

@ -28,6 +28,7 @@ import com.nflg.product.bomnew.util.ListCommonUtil;
import com.nflg.product.bomnew.util.VUtils; import com.nflg.product.bomnew.util.VUtils;
import com.nflg.product.bomnew.util.VersionUtil; import com.nflg.product.bomnew.util.VersionUtil;
import lombok.Getter; import lombok.Getter;
import org.aspectj.weaver.ast.ITestVisitor;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.time.LocalDateTime; import java.time.LocalDateTime;
@ -116,7 +117,14 @@ public class OriginalBomToEBomV2Convert extends BaseConvert {
BigDecimal totalWeightResult = BigDecimal.ZERO; BigDecimal totalWeightResult = BigDecimal.ZERO;
List<Long> rowIds=new ArrayList<>(); List<Long> rowIds=new ArrayList<>();
for (BomOriginalListVO item : list1) { for (BomOriginalListVO item : list1) {
numResult = NumberUtil.add(numResult, Objects.nonNull(item.getNum()) ? item.getNum() : BigDecimal.ZERO); BigDecimal numNew=BigDecimal.ZERO;
if( EBomConstant.KG.equalsIgnoreCase(item.getMaterialUnit())){
numNew= item.getTotalWeight();
}else {
numNew=NumberUtil.mul(item.getTotalWeight(),item.getNum());
}
// numResult = NumberUtil.add(numResult, Objects.nonNull( item.getNum()) ? item.getNum() : BigDecimal.ZERO);
numResult = NumberUtil.add(numResult, numNew);
totalWeightResult = NumberUtil.add(totalWeightResult, item.getTotalWeight()); totalWeightResult = NumberUtil.add(totalWeightResult, item.getTotalWeight());
rowIds.add(item.getRowId()); rowIds.add(item.getRowId());
} }