|
@@ -639,16 +639,16 @@ public class QualityInspectionManagementServiceImpl extends ServiceImpl<QualityI
|
|
paymentManagement.setWarehouseName(qualityInspectionManagement.getWarehouseName());
|
|
paymentManagement.setWarehouseName(qualityInspectionManagement.getWarehouseName());
|
|
paymentManagement.setUnitDeduction(qualityInspectionManagement1.getDeductionAmount()==null?0:qualityInspectionManagement1.getDeductionAmount());
|
|
paymentManagement.setUnitDeduction(qualityInspectionManagement1.getDeductionAmount()==null?0:qualityInspectionManagement1.getDeductionAmount());
|
|
Double money = (qualityInspectionManagement1.getDryGrainPrice()-paymentManagement.getUnitDeduction()) * qualityInspectionManagement1.getNetWeight();
|
|
Double money = (qualityInspectionManagement1.getDryGrainPrice()-paymentManagement.getUnitDeduction()) * qualityInspectionManagement1.getNetWeight();
|
|
-// BigDecimal money1 = new BigDecimal(money);
|
|
|
|
-// Double money2 = money1.setScale(2,BigDecimal.ROUND_HALF_UP).doubleValue();
|
|
|
|
if(qualityInspectionManagement1.getMoney() != null){
|
|
if(qualityInspectionManagement1.getMoney() != null){
|
|
money = qualityInspectionManagement1.getMoney();
|
|
money = qualityInspectionManagement1.getMoney();
|
|
}
|
|
}
|
|
- paymentManagement.setAmountIngPayable(money);
|
|
|
|
- paymentManagement.setAmountEdPayable(money);
|
|
|
|
- paymentManagement.setGrainMoney(Float.valueOf(String.valueOf(money)));
|
|
|
|
- paymentManagement.setCalculationPayable(money);
|
|
|
|
- paymentManagement.setActualPayment(money);
|
|
|
|
|
|
+ BigDecimal money1 = new BigDecimal(money);
|
|
|
|
+ Double money2 = money1.setScale(2,BigDecimal.ROUND_HALF_UP).doubleValue();
|
|
|
|
+ paymentManagement.setAmountIngPayable(money2);
|
|
|
|
+ paymentManagement.setAmountEdPayable(money2);
|
|
|
|
+ paymentManagement.setGrainMoney(Float.valueOf(String.valueOf(money2)));
|
|
|
|
+ paymentManagement.setCalculationPayable(money2);
|
|
|
|
+ paymentManagement.setActualPayment(money2);
|
|
|
|
|
|
paymentManagement.setSettlementClerk(commonStaff.getStaffName());
|
|
paymentManagement.setSettlementClerk(commonStaff.getStaffName());
|
|
paymentManagementService.insert(paymentManagement);
|
|
paymentManagementService.insert(paymentManagement);
|