|
@@ -199,8 +199,13 @@ public class PurchasePriceServiceImpl extends ServiceImpl<PurchasePriceMapper, P
|
|
purchasePriceDetail.setModelList(list);
|
|
purchasePriceDetail.setModelList(list);
|
|
}
|
|
}
|
|
purchasePrice.setDetails(details);
|
|
purchasePrice.setDetails(details);
|
|
- List<PurchasePriceDetailPrint> detailPrints = this.purchasePriceDetailPrintService.selectList(new EntityWrapper<PurchasePriceDetailPrint>().eq("main_id",purchasePrice.getId()).orderBy("water_min"));
|
|
|
|
- purchasePrice.setDetailPrints(detailPrints);
|
|
|
|
|
|
+ if("1".equals(purchasePrice.getBulkDensityStandard())){
|
|
|
|
+ List<PurchasePriceDetailPrint> detailPrints = this.purchasePriceDetailPrintService.selectList(new EntityWrapper<PurchasePriceDetailPrint>().eq("main_id",purchasePrice.getId()).orderBy("bulk_density_max",false));
|
|
|
|
+ purchasePrice.setDetailPrints(detailPrints);
|
|
|
|
+ }else {
|
|
|
|
+ List<PurchasePriceDetailPrint> detailPrints = this.purchasePriceDetailPrintService.selectList(new EntityWrapper<PurchasePriceDetailPrint>().eq("main_id",purchasePrice.getId()).orderBy("water_min"));
|
|
|
|
+ purchasePrice.setDetailPrints(detailPrints);
|
|
|
|
+ }
|
|
return purchasePrice;
|
|
return purchasePrice;
|
|
}
|
|
}
|
|
|
|
|