Merge branch 'master' of http://47.100.3.209:3000/gdc/yiliangyiyun

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/WarehouseInOutInfoServiceImpl.java

@@ -979,7 +979,7 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                                     tranSettlementReport.setSettlementWeight(tranSettlementReport.getLoadingWeight() > tranSettlementReport.getUnloadingWeight() ? tranSettlementReport.getUnloadingWeight() : tranSettlementReport.getLoadingWeight());
                                     tranSettlementReport.setTransportDamage(tranSettlementReport.getSettlementWeight()*0.001);
                                 }
-                                if(tranSettlementReport.getLossWeight()<0){
+                                if(tranSettlementReport.getLossWeight()<=0){
                                     tranSettlementReport.setActualLoss(0d);
                                     tranSettlementReport.setDeductionAmount(0d);
                                 }
@@ -1117,7 +1117,7 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                                         tranSettlementReport.setSettlementWeight(tranSettlementReport.getLoadingWeight() > tranSettlementReport.getUnloadingWeight() ? tranSettlementReport.getUnloadingWeight() : tranSettlementReport.getLoadingWeight());
                                         tranSettlementReport.setTransportDamage(tranSettlementReport.getSettlementWeight()*0.001);
                                     }
-                                    if(tranSettlementReport.getLossWeight()<0){
+                                    if(tranSettlementReport.getLossWeight()<=0){
                                         tranSettlementReport.setActualLoss(0d);
                                         tranSettlementReport.setDeductionAmount(0d);
                                     }
@@ -1387,7 +1387,7 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                                         tranSettlementReport.setSettlementWeight(tranSettlementReport.getLoadingWeight() > tranSettlementReport.getUnloadingWeight() ? tranSettlementReport.getUnloadingWeight() : tranSettlementReport.getLoadingWeight());
                                         tranSettlementReport.setTransportDamage(tranSettlementReport.getSettlementWeight()*0.001);
                                     }
-                                    if(tranSettlementReport.getLossWeight()<0){
+                                    if(tranSettlementReport.getLossWeight()<=0){
                                         tranSettlementReport.setActualLoss(0d);
                                         tranSettlementReport.setDeductionAmount(0d);
                                     }
@@ -4165,7 +4165,7 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                                         tranSettlementReport.setSettlementWeight(tranSettlementReport.getLoadingWeight() > tranSettlementReport.getUnloadingWeight() ? tranSettlementReport.getUnloadingWeight() : tranSettlementReport.getLoadingWeight());
                                         tranSettlementReport.setTransportDamage(tranSettlementReport.getSettlementWeight()*0.001);
                                     }
-                                    if(tranSettlementReport.getLossWeight()<0){
+                                    if(tranSettlementReport.getLossWeight()<=0){
                                         tranSettlementReport.setActualLoss(0d);
                                         tranSettlementReport.setDeductionAmount(0d);
                                     }
@@ -4310,7 +4310,7 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                                         tranSettlementReport.setSettlementWeight(tranSettlementReport.getLoadingWeight() > tranSettlementReport.getUnloadingWeight() ? tranSettlementReport.getUnloadingWeight() : tranSettlementReport.getLoadingWeight());
                                         tranSettlementReport.setTransportDamage(tranSettlementReport.getSettlementWeight()*0.001);
                                     }
-                                    if(tranSettlementReport.getLossWeight()<0){
+                                    if(tranSettlementReport.getLossWeight()<=0){
                                         tranSettlementReport.setActualLoss(0d);
                                         tranSettlementReport.setDeductionAmount(0d);
                                     }
@@ -4663,7 +4663,7 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                                         tranSettlementReport.setSettlementWeight(tranSettlementReport.getLoadingWeight() > tranSettlementReport.getUnloadingWeight() ? tranSettlementReport.getUnloadingWeight() : tranSettlementReport.getLoadingWeight());
                                         tranSettlementReport.setTransportDamage(tranSettlementReport.getSettlementWeight()*0.001);
                                     }
-                                    if(tranSettlementReport.getLossWeight()<0){
+                                    if(tranSettlementReport.getLossWeight()<=0){
                                         tranSettlementReport.setActualLoss(0d);
                                         tranSettlementReport.setDeductionAmount(0d);
                                     }