|
@@ -1400,53 +1400,55 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
|
|
|
WarehouseInOutInfo warehouseInOutInfo = this.selectById(id);
|
|
|
//付款信息
|
|
|
PaymentManagement paymentManagement = paymentManagementService.selectById(warehouseInOutInfo.getPaymentId());
|
|
|
- //质检信息
|
|
|
- QualityInspectionManagement qualityInspectionManagement = qualityInspectionManagementService.selectOne(new EntityWrapper<QualityInspectionManagement>()
|
|
|
- .eq("relation_id", paymentManagement.getRelationId())
|
|
|
- .eq("comp_id", paymentManagement.getCompId()));
|
|
|
- //检斤信息
|
|
|
- WeighingManagement weighingManagement = weighingManagementService.selectOne(new EntityWrapper<WeighingManagement>()
|
|
|
- .eq("relation_id", paymentManagement.getRelationId())
|
|
|
- .eq("comp_id", paymentManagement.getCompId()));
|
|
|
- PurchasePrice purchasePrice = purchasePriceService.selectOne(new EntityWrapper<PurchasePrice>()
|
|
|
- .eq("warehouse_name", qualityInspectionManagement.getWarehouseName())
|
|
|
- .eq("goods_name", qualityInspectionManagement.getGoodsName())
|
|
|
- .eq("status_flag", "3"));
|
|
|
- if (purchasePrice != null) {
|
|
|
- if (purchasePrice.getParamType().equals("1")) {
|
|
|
- PurchasePriceDetail purchasePriceDetail = purchasePriceDetailService.selectOne(new EntityWrapper<PurchasePriceDetail>()
|
|
|
- .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 (paymentManagement!=null) {
|
|
|
+ //质检信息
|
|
|
+ QualityInspectionManagement qualityInspectionManagement = qualityInspectionManagementService.selectOne(new EntityWrapper<QualityInspectionManagement>()
|
|
|
+ .eq("relation_id", paymentManagement.getRelationId())
|
|
|
+ .eq("comp_id", paymentManagement.getCompId()));
|
|
|
+ //检斤信息
|
|
|
+ WeighingManagement weighingManagement = weighingManagementService.selectOne(new EntityWrapper<WeighingManagement>()
|
|
|
+ .eq("relation_id", paymentManagement.getRelationId())
|
|
|
+ .eq("comp_id", paymentManagement.getCompId()));
|
|
|
+ PurchasePrice purchasePrice = purchasePriceService.selectOne(new EntityWrapper<PurchasePrice>()
|
|
|
+ .eq("warehouse_name", qualityInspectionManagement.getWarehouseName())
|
|
|
+ .eq("goods_name", qualityInspectionManagement.getGoodsName())
|
|
|
+ .eq("status_flag", "3"));
|
|
|
+ if (purchasePrice != null) {
|
|
|
+ if (purchasePrice.getParamType().equals("1")) {
|
|
|
+ PurchasePriceDetail purchasePriceDetail = purchasePriceDetailService.selectOne(new EntityWrapper<PurchasePriceDetail>()
|
|
|
+ .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]);
|
|
|
+ }
|
|
|
}
|
|
|
+ param += qualityInspectionManagement.getBuckleMiscellaneous();
|
|
|
+ DecimalFormat df = new DecimalFormat("#.00");
|
|
|
+ param = Float.parseFloat(df.format(param));
|
|
|
+ warehouseInOutInfo.setWeightDeduction(param);
|
|
|
+ } else {
|
|
|
+ warehouseInOutInfo.setWeightDeduction(weighingManagement.getBuckleMiscellaneous());
|
|
|
}
|
|
|
- param += qualityInspectionManagement.getBuckleMiscellaneous();
|
|
|
- DecimalFormat df = new DecimalFormat("#.00");
|
|
|
- param = Float.parseFloat(df.format(param));
|
|
|
- warehouseInOutInfo.setWeightDeduction(param);
|
|
|
- } else {
|
|
|
- warehouseInOutInfo.setWeightDeduction(weighingManagement.getBuckleMiscellaneous());
|
|
|
+ qualityInspectionManagement.setWaterMin(purchasePrice.getWaterMin());
|
|
|
}
|
|
|
- qualityInspectionManagement.setWaterMin(purchasePrice.getWaterMin());
|
|
|
+ IdentityAuthenticationInfo identityAuthenticationInfo = iIdentityAuthenticationInfoService.selectOne(new EntityWrapper<IdentityAuthenticationInfo>()
|
|
|
+ .eq("customer_name", paymentManagement.getCustomerName())
|
|
|
+ .eq("customer_phone", paymentManagement.getCustomerPhone())
|
|
|
+ .eq("customer_type_flag", "1"));
|
|
|
+ warehouseInOutInfo.setPaymentManagement(paymentManagement);
|
|
|
+ warehouseInOutInfo.setIdentityAuthenticationInfo(identityAuthenticationInfo);
|
|
|
+ warehouseInOutInfo.setQualityInspectionManagement(qualityInspectionManagement);
|
|
|
+ warehouseInOutInfo.setWeighingManagement(weighingManagement);
|
|
|
}
|
|
|
- IdentityAuthenticationInfo identityAuthenticationInfo = iIdentityAuthenticationInfoService.selectOne(new EntityWrapper<IdentityAuthenticationInfo>()
|
|
|
- .eq("customer_name", paymentManagement.getCustomerName())
|
|
|
- .eq("customer_phone", paymentManagement.getCustomerPhone())
|
|
|
- .eq("customer_type_flag", "1"));
|
|
|
- warehouseInOutInfo.setPaymentManagement(paymentManagement);
|
|
|
- warehouseInOutInfo.setIdentityAuthenticationInfo(identityAuthenticationInfo);
|
|
|
- warehouseInOutInfo.setQualityInspectionManagement(qualityInspectionManagement);
|
|
|
- warehouseInOutInfo.setWeighingManagement(weighingManagement);
|
|
|
//详情信息
|
|
|
WarehouseInOutDetail warehouseInOutDetail = warehouseInOutDetailService.selectOne(new EntityWrapper<WarehouseInOutDetail>().eq(WarehouseInOutDetail.QueryFiles.INFO_ID, id));
|
|
|
if (warehouseInOutDetail != null) {
|