|
@@ -437,7 +437,7 @@ public class WarehousingOrderServiceImpl extends ServiceImpl<WarehousingOrderMap
|
|
|
QualityInspectionManagement qualityInspectionManagement = qualityInspectionManagementService.selectOne(new EntityWrapper<QualityInspectionManagement>()
|
|
|
.eq("relation_id", paymentManagement.getRelationId()));
|
|
|
if (qualityInspectionManagement != null) {
|
|
|
- if (qualityInspectionManagement.getWaterContent() != null) {
|
|
|
+ if (qualityInspectionManagement.getWaterContent() != null&&!"".equals(qualityInspectionManagement.getWaterContent())) {
|
|
|
totalMoisture = totalMoisture + Double.valueOf(qualityInspectionManagement.getWaterContent())
|
|
|
* Double.valueOf(String.valueOf(paymentManagement.getNetWeight() / 1000));
|
|
|
}
|
|
@@ -537,7 +537,7 @@ public class WarehousingOrderServiceImpl extends ServiceImpl<WarehousingOrderMap
|
|
|
QualityInspectionManagement qualityInspectionManagement = qualityInspectionManagementService.selectOne(new EntityWrapper<QualityInspectionManagement>()
|
|
|
.eq("warehouse_in_out_id", warehouseInOutInfo.getId()));
|
|
|
if (qualityInspectionManagement != null) {
|
|
|
- if (qualityInspectionManagement.getWaterContent() != null) {
|
|
|
+ if (qualityInspectionManagement.getWaterContent() != null&&!"".equals(qualityInspectionManagement.getWaterContent())) {
|
|
|
totalMoisture = totalMoisture + Double.valueOf(qualityInspectionManagement.getWaterContent())
|
|
|
* warehouseInOutInfo.getNetWeight();
|
|
|
} else {
|
|
@@ -611,7 +611,7 @@ public class WarehousingOrderServiceImpl extends ServiceImpl<WarehousingOrderMap
|
|
|
QualityInspectionManagement qualityInspectionManagement = qualityInspectionManagementService.selectOne(new EntityWrapper<QualityInspectionManagement>()
|
|
|
.eq("warehouse_in_out_id", warehouseInOutInfo.getId()));
|
|
|
if (qualityInspectionManagement != null) {
|
|
|
- if (qualityInspectionManagement.getWaterContent() != null) {
|
|
|
+ if (qualityInspectionManagement.getWaterContent() != null&&!"".equals(qualityInspectionManagement.getWaterContent())) {
|
|
|
totalMoisture = Double.valueOf(qualityInspectionManagement.getWaterContent());
|
|
|
}
|
|
|
}
|
|
@@ -746,7 +746,7 @@ public class WarehousingOrderServiceImpl extends ServiceImpl<WarehousingOrderMap
|
|
|
QualityInspectionManagement qualityInspectionManagement = qualityInspectionManagementService.selectOne(new EntityWrapper<QualityInspectionManagement>()
|
|
|
.eq("warehouse_in_out_id", warehouseInOutInfo.getId()));
|
|
|
if (qualityInspectionManagement != null) {
|
|
|
- if (qualityInspectionManagement.getWaterContent() != null) {
|
|
|
+ if (qualityInspectionManagement.getWaterContent() != null&&!"".equals(qualityInspectionManagement.getWaterContent())) {
|
|
|
totalMoisture = Double.valueOf(qualityInspectionManagement.getWaterContent());
|
|
|
}
|
|
|
}
|