1

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/PurchasePrice.java

@@ -141,6 +141,11 @@ public class PurchasePrice extends BaseModel<PurchasePrice> {
      */
     @TableField(exist = false)
     private String creater;
+    /**
+     * 容重下限
+     */
+    @TableField(exist = false)
+    private Float bulkDensityMin;
 
     @Override
     protected Serializable pkVal() {

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/QualityInspectionManagementServiceImpl.java

@@ -19,6 +19,7 @@ import com.yh.saas.plugin.yiliangyiyun.service.*;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
 import com.yh.saas.plugin.yiliangyiyun.util.Const;
 import com.yh.saas.plugin.yiliangyiyun.util.QRCodeUtil;
+import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -42,6 +43,8 @@ public class QualityInspectionManagementServiceImpl extends ServiceImpl<QualityI
     @Autowired
     private IPurchasePriceService purchasePriceService;
     @Autowired
+    private IPurchasePriceDetailPrintService purchasePriceDetailPrintService;
+    @Autowired
     private ICommonCompanyService commonCompanyService;
     @Autowired
     private IWarehouseBaseInfoService warehouseBaseInfoService;
@@ -302,6 +305,15 @@ public class QualityInspectionManagementServiceImpl extends ServiceImpl<QualityI
         List<PurchasePrice> purchasePriceList=purchasePriceService.selectList(new EntityWrapper<PurchasePrice>()
             .eq("warehouse_id",warehouseId)
             .eq("status","已通过"));
+        if(CollectionUtils.isNotEmpty(purchasePriceList)){
+            for (PurchasePrice purchasePrice:purchasePriceList){
+                List<PurchasePriceDetailPrint> purchasePriceDetailPrints=purchasePriceDetailPrintService.selectList(new EntityWrapper<PurchasePriceDetailPrint>()
+                .eq("main_id",purchasePrice.getId()).orderBy("bulk_density_min"));
+                if (CollectionUtils.isNotEmpty(purchasePriceDetailPrints)){
+                    purchasePrice.setBulkDensityMin(purchasePriceDetailPrints.get(0).getBulkDensityMin());
+                }
+            }
+        }
         return purchasePriceList;
     }