ccj 3 年之前
父節點
當前提交
078c991e3d

+ 14 - 1
winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/WarehouseBaseInfoServiceImpl.java

@@ -792,8 +792,21 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                             .eq("delete_flag", "0"));
                     for (WarehouseBaseInfo warehouseBaseInfo:warehouseBaseInfoList1){
                         warehouseBaseInfo.setFlag("全部");
+                        //查潮粮单价已审核的数据
+                        List<PurchasePrice> purchasePriceList=purchasePriceService.selectList(new EntityWrapper<PurchasePrice>()
+                                .eq("warehouse_id",warehouseBaseInfo.getId())
+                                .eq("status_flag","3"));
+                        if (!CollectionUtils.isEmpty(purchasePriceList)){
+                            warehouseBaseInfo.setPurchasePriceList(purchasePriceList);
+                        }
+                        Map<String, Object> pageView = new HashMap<>();
+                        pageView.put("warehouseName", warehouseBaseInfo.getWarehouseName());
+                        pageView.put("compId", warehouseBaseInfo.getCompId());
+                        // 查询质检信息包括已删除的
+                        Integer dataCount = baseMapper.getCountByCondition(pageView);
+                        warehouseBaseInfo.setCount(dataCount);
+                        warehouseBaseInfoList.add(warehouseBaseInfo);
                     }
-                    warehouseBaseInfoList=warehouseBaseInfoList1;
                     return warehouseBaseInfoList;
                 }
             }