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/TranProcessInfoServiceImpl.java

@@ -497,6 +497,9 @@ public class TranProcessInfoServiceImpl extends ServiceImpl<TranProcessInfoMappe
                                         if (tranSettlementReport1.getGrainPrice()!=null){
                                             tranSettlementReport1.setDeductionAmount(String.valueOf(tranSettlementReport1.getCargoDamage()*tranSettlementReport1.getGrainPrice()));
                                         }
+                                        else{
+                                            tranSettlementReport1.setDeductionAmount("0");
+                                        }
                                     }
                                     //0<损耗<结算重量的1‰时
                                     else if(tranSettlementReport1.getLossWeight()>0&&tranSettlementReport1.getLossWeight()<tranSettlementReport1.getSettlementWeight()*0.001){

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

@@ -982,6 +982,9 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                                     if (tranSettlementReport.getGrainPrice()!=null){
                                         tranSettlementReport.setDeductionAmount(String.valueOf(tranSettlementReport.getCargoDamage()*tranSettlementReport.getGrainPrice()));
                                     }
+                                    else{
+                                        tranSettlementReport.setDeductionAmount("0");
+                                    }
                                 }
                                 //0<损耗<=结算重量的1‰时
                                 else if(tranSettlementReport.getLossWeight()>0&&tranSettlementReport.getLossWeight()<=tranSettlementReport.getSettlementWeight()*0.001){
@@ -3821,6 +3824,9 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                                         if (tranSettlementReport.getGrainPrice()!=null){
                                             tranSettlementReport.setDeductionAmount(String.valueOf(tranSettlementReport.getCargoDamage()*tranSettlementReport.getGrainPrice()));
                                         }
+                                        else{
+                                            tranSettlementReport.setDeductionAmount("0");
+                                        }
                                     }
                                     //0<损耗<=结算重量的1‰时
                                     else if(tranSettlementReport.getLossWeight()>0&&tranSettlementReport.getLossWeight()<=tranSettlementReport.getSettlementWeight()*0.001){