ak/zn-cloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of http://47.97.8.94:19527/yj/zn-cloud into dev

Browse Source
This commit is contained in:
aikai 2024-06-14 12:05:51 +08:00
commit 51e4216ba0
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/convert/packageData/PackageDataConvert.java
View File

@ -30,12 +30,19 @@ public interface PackageDataConvert {
PackageDataDO dataDO = BeanUtils.toBean(respVO, PackageDataDO.class); PackageDataDO dataDO = BeanUtils.toBean(respVO, PackageDataDO.class);
if (dataDO.getAutoNum() == null && dataDO.getNum() == null && dataDO.getDamageNum() == null) {
continue;
}
String[] size = dataDO.getSizeName().split("\\*"); String[] size = dataDO.getSizeName().split("\\*");
//计算平方数 //计算平方数
BigDecimal squareNum = BigDecimal.valueOf((double) Integer.parseInt(size[0]) / 1000) BigDecimal squareNum = BigDecimal.valueOf((double) Integer.parseInt(size[0]) / 1000)
.multiply(BigDecimal.valueOf((double) Integer.parseInt(size[1]) / 1000)) .multiply(BigDecimal.valueOf((double) Integer.parseInt(size[1]) / 1000))
.multiply(BigDecimal.valueOf(dataDO.getSizePieces())) .multiply(BigDecimal.valueOf(dataDO.getSizePieces()))
.multiply(BigDecimal.valueOf(Integer.sum(dataDO.getNum(), dataDO.getAutoNum()))); .multiply(BigDecimal.valueOf(
Integer.sum(dataDO.getNum() == null ? 0 : dataDO.getNum(),
dataDO.getAutoNum() == null ? 0 : dataDO.getAutoNum())
));
//设置平方数 //设置平方数
dataDO.setSquareNum(squareNum); dataDO.setSquareNum(squareNum);