zhangyuewww 1 year ago
parent
commit
ca59ebc3c6

+ 4 - 4
winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/WarehousingOrderServiceImpl.java

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