|
@@ -466,7 +466,8 @@ public class QualityInspectionManagementServiceImpl extends ServiceImpl<QualityI
|
|
|
paymentManagement.setTare(weighingManagement.getTare());
|
|
|
paymentManagement.setSettlementDate(qualityInspectionManagement1.getQualityDate());
|
|
|
paymentManagement.setWarehouseName(qualityInspectionManagement.getWarehouseName());
|
|
|
- Double money = (new BigDecimal(qualityInspectionManagement1.getDryGrainPrice())).doubleValue() * qualityInspectionManagement1.getNetWeight();
|
|
|
+ paymentManagement.setUnitDeduction(qualityInspectionManagement1.getDeductionAmount()==null?0:qualityInspectionManagement1.getDeductionAmount());
|
|
|
+ Double money = ((new BigDecimal(qualityInspectionManagement1.getDryGrainPrice())).doubleValue()-paymentManagement.getUnitDeduction()) * qualityInspectionManagement1.getNetWeight();
|
|
|
paymentManagement.setAmountIngPayable(money);
|
|
|
paymentManagement.setAmountEdPayable(money);
|
|
|
paymentManagement.setGrainMoney(Float.valueOf(String.valueOf(money)));
|