|
|
@@ -169,7 +169,7 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
|
|
|
.eq("status_flag", "3").eq("goods_name_key", warehouseInOutInfo.getGoodsNameKey()));
|
|
|
|
|
|
if (!CollectionUtils.isEmpty(warehouseInOutInfoAllList)) {
|
|
|
- Float netWeight = 0f;
|
|
|
+ Double netWeight = 0d;
|
|
|
for (WarehouseInOutInfo warehouse : warehouseInOutInfoAllList) {
|
|
|
//潮粮累计纯重，干粮累计净重
|
|
|
// if(warehouse.getType() == null){
|
|
|
@@ -178,7 +178,7 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
|
|
|
// else{
|
|
|
// netWeight = Float.valueOf(netWeight) + Float.valueOf(warehouse.getType().equals("潮粮") ?warehouse.getPureWeight():warehouse.getNetWeight());
|
|
|
// }
|
|
|
- netWeight = (float)(Math.round(new BigDecimal(netWeight).add(new BigDecimal(warehouse.getNetWeight())).doubleValue()*1000))/1000;
|
|
|
+ netWeight = (double)(Math.round(new BigDecimal(netWeight).add(new BigDecimal(warehouse.getNetWeight())).doubleValue()*1000))/1000;
|
|
|
// netWeight = (float)(Math.round(((float)(Math.round(netWeight*1000))/1000+(float)(Math.round(warehouse.getNetWeight()*1000))/1000)*1000))/1000;
|
|
|
}
|
|
|
warehouseNumView.setGoodsName(warehouseInOutInfoAllList.get(0).getGoodsName());
|
|
|
@@ -213,7 +213,7 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
|
|
|
.eq("status_flag", "3").eq("in_out_flag", "1").groupBy("goods_name_key").orderBy("goods_name_key"));
|
|
|
if (!CollectionUtils.isEmpty(warehouseInOutInfos)) {
|
|
|
for (WarehouseInOutInfo warehouseInOutInfo : warehouseInOutInfos) {
|
|
|
- Float netWeight = 0f;
|
|
|
+ Double netWeight = 0d;
|
|
|
outNetWeight = "0";
|
|
|
List<WarehouseInOutInfo> warehouseInOutInfoAllList = warehouseInOutInfoService.selectList(new EntityWrapper<WarehouseInOutInfo>()
|
|
|
.eq("status_flag", "3").eq("delete_flag", "0")
|
|
|
@@ -222,7 +222,7 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
|
|
|
for (WarehouseInOutInfo warehouse : warehouseInOutInfoAllList) {
|
|
|
//潮粮累计纯重，干粮累计净重
|
|
|
// netWeight = netWeight + (warehouse.getPureWeight()!=null?warehouse.getPureWeight():warehouse.getNetWeight());
|
|
|
- netWeight = Float.valueOf(netWeight) + Float.valueOf(warehouse.getNetWeight());
|
|
|
+ netWeight = Double.valueOf(netWeight) + Double.valueOf(warehouse.getNetWeight());
|
|
|
}
|
|
|
if (StringUtils.isEmpty(outNetWeight)) {
|
|
|
outNetWeight = "0";
|
|
|
@@ -282,11 +282,11 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
|
|
|
.eq("status_flag", "3").eq("goods_name_key", warehouseInOutInfo.getGoodsNameKey()));
|
|
|
|
|
|
if (!CollectionUtils.isEmpty(warehouseInOutInfoAllList)) {
|
|
|
- Float netWeight = 0f;
|
|
|
+ Double netWeight = 0d;
|
|
|
for (WarehouseInOutInfo warehouse : warehouseInOutInfoAllList) {
|
|
|
//潮粮累计纯重，干粮累计净重
|
|
|
// netWeight = netWeight + (warehouse.getPureWeight()!=null?warehouse.getPureWeight():warehouse.getNetWeight());
|
|
|
- netWeight = Float.valueOf(netWeight) + Float.valueOf(warehouse.getNetWeight());
|
|
|
+ netWeight = Double.valueOf(netWeight) + Double.valueOf(warehouse.getNetWeight());
|
|
|
}
|
|
|
warehouseNumView.setGoodsName(warehouseInOutInfoAllList.get(0).getGoodsName());
|
|
|
warehouseNumView.setInNetWeight(String.valueOf(netWeight));
|
|
|
@@ -308,7 +308,7 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
|
|
|
.eq("status_flag", "3").eq("in_out_flag", "1").groupBy("goods_name_key").orderBy("goods_name_key"));
|
|
|
if (!CollectionUtils.isEmpty(warehouseInOutInfos)) {
|
|
|
for (WarehouseInOutInfo warehouseInOutInfo : warehouseInOutInfos) {
|
|
|
- Float netWeight = 0f;
|
|
|
+ Double netWeight = 0d;
|
|
|
outNetWeight = "0";
|
|
|
List<WarehouseInOutInfo> warehouseInOutInfoAllList = warehouseInOutInfoService.selectList(new EntityWrapper<WarehouseInOutInfo>()
|
|
|
.eq("status_flag", "3").eq("delete_flag", "0")
|
|
|
@@ -317,7 +317,7 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
|
|
|
for (WarehouseInOutInfo warehouse : warehouseInOutInfoAllList) {
|
|
|
//潮粮累计纯重，干粮累计净重
|
|
|
// netWeight = netWeight + (warehouse.getPureWeight()!=null?warehouse.getPureWeight():warehouse.getNetWeight());
|
|
|
- netWeight = Float.valueOf(netWeight) + Float.valueOf(warehouse.getNetWeight());
|
|
|
+ netWeight = Double.valueOf(netWeight) + Double.valueOf(warehouse.getNetWeight());
|
|
|
}
|
|
|
if (StringUtils.isEmpty(outNetWeight)) {
|
|
|
outNetWeight = "0";
|
