|
@@ -266,23 +266,25 @@ public class PaymentManagementServiceImpl extends ServiceImpl<PaymentManagementM
|
|
|
.eq("main_id", purchasePrice.getId())
|
|
|
.like("level", qualityInspectionManagement.getGrade().replace("品", ""))
|
|
|
.eq("delete_flag", "0"));
|
|
|
- String[] point = purchasePriceDetail.getPoint().split(",");
|
|
|
- String[] pointPrice = purchasePriceDetail.getPointPrice().split(",");
|
|
|
- Float param = 0f;
|
|
|
- for (int i = 0; i < point.length - 1; i++) {
|
|
|
- if (Float.parseFloat(qualityInspectionManagement.getWaterContent()) >= Float.parseFloat(point[i])
|
|
|
- && Float.parseFloat(qualityInspectionManagement.getWaterContent()) < Float.parseFloat(point[i + 1])) {
|
|
|
- param += (Float.parseFloat(qualityInspectionManagement.getWaterContent()) - Float.parseFloat(point[i])) * Float.parseFloat(pointPrice[i]);
|
|
|
- break;
|
|
|
- } else {
|
|
|
- param += (Float.parseFloat(point[i + 1]) - Float.parseFloat(point[i])) * Float.parseFloat(pointPrice[i]);
|
|
|
+ if (purchasePriceDetail!=null) {
|
|
|
+ String[] point = purchasePriceDetail.getPoint().split(",");
|
|
|
+ String[] pointPrice = purchasePriceDetail.getPointPrice().split(",");
|
|
|
+ Float param = 0f;
|
|
|
+ for (int i = 0; i < point.length - 1; i++) {
|
|
|
+ if (Float.parseFloat(qualityInspectionManagement.getWaterContent()) >= Float.parseFloat(point[i])
|
|
|
+ && Float.parseFloat(qualityInspectionManagement.getWaterContent()) < Float.parseFloat(point[i + 1])) {
|
|
|
+ param += (Float.parseFloat(qualityInspectionManagement.getWaterContent()) - Float.parseFloat(point[i])) * Float.parseFloat(pointPrice[i]);
|
|
|
+ break;
|
|
|
+ } else {
|
|
|
+ param += (Float.parseFloat(point[i + 1]) - Float.parseFloat(point[i])) * Float.parseFloat(pointPrice[i]);
|
|
|
+ }
|
|
|
}
|
|
|
+ param += qualityInspectionManagement.getBuckleMiscellaneous();
|
|
|
+ DecimalFormat df = new DecimalFormat("#.00");
|
|
|
+ param = Float.parseFloat(df.format(param));
|
|
|
+ paymentManagement.setParam(param);
|
|
|
+ paymentManagement.setWeightDeduction(param);
|
|
|
}
|
|
|
- param += qualityInspectionManagement.getBuckleMiscellaneous();
|
|
|
- DecimalFormat df = new DecimalFormat("#.00");
|
|
|
- param = Float.parseFloat(df.format(param));
|
|
|
- paymentManagement.setParam(param);
|
|
|
- paymentManagement.setWeightDeduction(param);
|
|
|
} else {
|
|
|
paymentManagement.setWeightDeduction(weighingManagement.getBuckleMiscellaneous());
|
|
|
}
|