仓库出租率租赁散租面积处理

mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/Lease/LeaseApplicationService.java

@@ -322,7 +322,21 @@ public class LeaseApplicationService {
             BeanUtils.copyProperties(ca, shipperLeaseDetails);
             shipperLeaseDetails.setBusinessDate(yesterday);
             // 散租面积直接使用租赁管理页面维护的面积
-            shipperLeaseDetails.setLeaseArea(ca.getLeaseArea());
+            //查询这个货主的物料面积
+            BigDecimal leaseArea = BigDecimal.ZERO;
+            MaterialInventoryDTO materialInventoryDTO = new MaterialInventoryDTO();
+            materialInventoryDTO.setShipperId(ca.getShipperId());
+            materialInventoryDTO.setWarehouseId(ca.getWarehouseId());
+            AjaxResult ajaxResult = WmsServiceFeign.materialInventoryApiListAll(materialInventoryDTO);
+            if (ajaxResult != null && "200".equals(String.valueOf(ajaxResult.get("code")))) {
+                List<MaterialInventoryPO> batchDetailFeignPOList = JSON.parseArray(
+                        com.alibaba.fastjson2.JSONObject.toJSONString(ajaxResult.get("data")), MaterialInventoryPO.class);
+                leaseArea = batchDetailFeignPOList.stream()
+                        .map(MaterialInventoryPO::getArea)
+                        .filter(Objects::nonNull)
+                        .reduce(BigDecimal.ZERO, BigDecimal::add);
+            }
+            shipperLeaseDetails.setLeaseArea(leaseArea);
             log.info("货主：{}，仓库：{}，散租面积：{}（来自租赁管理）", ca.getCargoOwnerName(), ca.getWarehouseName(), ca.getLeaseArea());
 
             // 如果已存在，则更新；否则新增