入库费用登记查询

mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/BmsServiceFeign.java

@@ -18,7 +18,7 @@ import java.util.Set;
 /**
  * bms财务结算系统feign调用接口
  */
-@FeignClient(contextId = "BmsService", value = ServiceNameConstants.BMS_SERVICE,url = "http://10.102.192.3:8019",fallbackFactory = RemoteBmsFeignFallbackFactory.class, configuration = FeignAutoConfiguration.class)
+@FeignClient(contextId = "BmsService", value = ServiceNameConstants.BMS_SERVICE, url = "http://127.0.0.1:8019",fallbackFactory = RemoteBmsFeignFallbackFactory.class, configuration = FeignAutoConfiguration.class)
 public interface BmsServiceFeign {
 
 
@@ -35,6 +35,13 @@ public interface BmsServiceFeign {
     @GetMapping("/settlementCustomersApi/getInfoByCode")
     public AjaxResult getCustomersInfoByCode(@RequestParam("settlementCustomersCode")String settlementCustomersCode);
 
+    /**
+     * 按结算主体ID（如货主ID，对应 settlement_customers.settlement_entity_id）查询结算对象
+     */
+    @GetMapping("/settlementCustomersApi/getInfoBySettlementEntityId")
+    AjaxResult getCustomersInfoBySettlementEntityId(@RequestParam("settlementEntityId") Long settlementEntityId,
+                                                    @RequestParam(value = "topOrganizationId", required = false) Long topOrganizationId);
+
 
     /**
      * 推送同步业务单据

mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/factory/RemoteBmsFeignFallbackFactory.java

@@ -42,6 +42,11 @@ public class RemoteBmsFeignFallbackFactory implements FallbackFactory<BmsService
                 return AjaxResult.error(throwable.getMessage());
             }
 
+            @Override
+            public AjaxResult getCustomersInfoBySettlementEntityId(Long settlementEntityId, Long topOrganizationId) {
+                return AjaxResult.error(throwable.getMessage());
+            }
+
             @Override
             public AjaxResult pushSyncData(BusinessDataPushDTO businessDataPushDTO) {
                 return AjaxResult.error(throwable.getMessage());

mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/expenseAccount/ExpenseAccountApplicationService.java

@@ -18,9 +18,11 @@ import com.mhd.common.core.enums.DictCode;
 import com.mhd.common.core.exception.ServiceException;
 import com.mhd.common.core.exception.digitalLogisticsException.DigitalLogisticsException;
 import com.mhd.common.core.exception.digitalLogisticsException.UserError;
+import com.mhd.common.core.domain.po.SettlementCustomersPO;
 import com.mhd.common.core.utils.StringUtils;
 import com.mhd.common.core.web.domain.AjaxResult;
 import com.mhd.common.security.utils.SecurityUtils;
+import com.mhd.system.api.BmsServiceFeign;
 import com.mhd.system.api.SystemServiceFeign;
 import com.mhd.system.api.model.LoginUser;
 import com.mhd.common.core.domain.po.UserPo;
@@ -51,12 +53,15 @@ public class ExpenseAccountApplicationService {
     private ContractManageApplicationService contractManageApplicationService;
     @Autowired
     private SystemServiceFeign systemServiceFeign;
+    @Autowired
+    private BmsServiceFeign bmsServiceFeign;
 
     /**
      * 入库/出库费用登记等场景：按仓储合同「仓库进出仓单」结算行取科目（二级编码优先，否则一级），再关联费用科目主数据。
      * <p>科目范围以合同结算设置为准；若 {@code expenseAccountDO.inOrderDisplay} 或 {@code expenseAccountDO.outOrderDisplay} 非空，
      * 再按主数据「入库单是否固定显示 / 出库单是否固定显示」（0-否 1-是）与入参相等过滤，二者同时传则同时满足（AND）。</p>
      * settlementCustomersCode 不传或为空时使用通用仓储合同。
+     * <p>若 {@code settlementCustomersCode} 为空且 {@code expenseAccountDO.settlementEntityId} 非空，则通过 BMS 按结算主体ID解析结算对象编码后再查合同（编码仍为空则走通用合同）。</p>
      */
     public List<ExpenseAccountPO> queryListFromContractWarehouseInOutSettlement(ExpenseAccountDO expenseAccountDO, String settlementCustomersCode) {
         Long topOrgIdForExpense = expenseAccountDO.getTopOrganizationId();
@@ -66,8 +71,15 @@ public class ExpenseAccountApplicationService {
                 topOrgIdForExpense = lu.getUserPo().getTopOrganizationId();
             }
         }
+        String effectiveSettlementCode = settlementCustomersCode;
+        if (StringUtils.isEmpty(effectiveSettlementCode) && expenseAccountDO.getSettlementEntityId() != null) {
+            effectiveSettlementCode = resolveSettlementCustomersCodeByEntityId(
+                    expenseAccountDO.getSettlementEntityId(), topOrgIdForExpense);
+            log.info("按结算主体ID解析结算对象编码：settlementEntityId={}，解析得到 settlementCustomersCode={}",
+                    expenseAccountDO.getSettlementEntityId(), effectiveSettlementCode);
+        }
         List<String> orderedCodes = contractManageApplicationService.listSecondSubjectCodesBySettlementAndDocumentType(
-                settlementCustomersCode,
+                effectiveSettlementCode,
                 expenseAccountDO.getOrganizationId(),
                 topOrgIdForExpense,
                 ContractManageApplicationService.DOCUMENT_TYPE_CODE_WAREHOUSE_IN_OUT_ORDER);
@@ -92,6 +104,27 @@ public class ExpenseAccountApplicationService {
         return result;
     }
 
+    /**
+     * 通过 BMS 按 settlement_entity_id 取结算对象编码，供合同匹配；失败返回 null（走通用合同）。
+     */
+    private String resolveSettlementCustomersCodeByEntityId(Long settlementEntityId, Long topOrganizationId) {
+        try {
+            AjaxResult ajaxResult = bmsServiceFeign.getCustomersInfoBySettlementEntityId(settlementEntityId, topOrganizationId);
+            if (ajaxResult == null || !"200".equals(String.valueOf(ajaxResult.get("code"))) || ajaxResult.get("data") == null) {
+                log.warn("按 settlementEntityId 查询结算对象未成功：code={}", ajaxResult != null ? ajaxResult.get("code") : null);
+                return null;
+            }
+            SettlementCustomersPO po = JSON.parseObject(JSON.toJSONString(ajaxResult.get("data")), SettlementCustomersPO.class);
+            if (po == null || StringUtils.isEmpty(po.getSettlementCustomersCode())) {
+                return null;
+            }
+            return po.getSettlementCustomersCode().trim();
+        } catch (Exception e) {
+            log.warn("按 settlementEntityId 解析结算对象编码异常", e);
+            return null;
+        }
+    }
+
     /**
      * 合同路径下可选：与主数据 in_order_display / out_order_display 一致才保留（入参为 null 的维度不参与过滤）。
      */

mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/expenseAccount/repository/todo/ExpenseAccountDO.java

@@ -181,4 +181,7 @@ public class ExpenseAccountDO extends BaseVOEntity{
 
     /** 查询参数：结算主体编码（货主编码等） */
     private String settlementCustomersCode;
+
+    /** 查询参数：结算主体ID（货主ID等，对应 settlement_customers.settlement_entity_id） */
+    private Long settlementEntityId;
 }

mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/dto/expenseAccount/ExpenseAccountDTO.java

@@ -169,4 +169,11 @@ public class ExpenseAccountDTO extends BaseVOEntity{
 
     @ApiModelProperty("结算主体编码（通常为货主编码）；不传则按通用仓储合同的结算设置取科目")
     private String settlementCustomersCode;
+
+    /**
+     * 结算主体ID（货主等业务主体ID，与 BMS settlement_customers.settlement_entity_id 一致）。
+     * 与 settlementCustomersCode 二选一：编码优先；仅传本字段时在 BMS 解析出结算对象编码后再走合同（有客户合同用客户，无则通用）。
+     */
+    @ApiModelProperty("结算主体ID（货主ID等，对应 settlement_entity_id）；与 settlementCustomersCode 二选一，编码优先")
+    private Long settlementEntityId;
 }

mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/facade/expenseAccount/ExpenseAccountApi.java

@@ -53,6 +53,7 @@ public class ExpenseAccountApi extends BaseController{
      *
      * <p>入库/出库费用登记等场景传 {@code contractSettlementQuery=true}（与单据类型「仓库进出仓单」合同结算行一致），
      * 科目来源、结算主体为空走通用合同等逻辑<strong>入库与出库相同</strong>。
+     * 可传 {@code settlementCustomersCode}，或仅传 {@code settlementEntityId}（货主/结算主体ID，对应 BMS settlement_entity_id）由服务端解析结算编码后再匹配合同（有客户合同用客户，无则通用；编码优先）。
      * 先按合同结算行取科目，再关联主数据；若请求中传入 {@code inOrderDisplay} 或 {@code outOrderDisplay}（0-否 1-是），
      * 则再按主数据「入库单 / 出库单是否固定显示」与入参相等过滤（二者都传则同时满足）。不传则不在此维度过滤。</p>
      */
@@ -70,8 +71,9 @@ public class ExpenseAccountApi extends BaseController{
             if (Boolean.TRUE.equals(expenseAccountDTO.getContractSettlementQuery())) {
                 ExpenseAccountDO contractQueryDO = new ExpenseAccountDO();
                 BeanUtils.copyProperties(expenseAccountDTO, contractQueryDO);
-                logger.info("按合同结算设置查询费用科目，settlementCustomersCode={}，inOrderDisplay={}，outOrderDisplay={}",
+                logger.info("按合同结算设置查询费用科目，settlementCustomersCode={}，settlementEntityId={}，inOrderDisplay={}，outOrderDisplay={}",
                         expenseAccountDTO.getSettlementCustomersCode(),
+                        expenseAccountDTO.getSettlementEntityId(),
                         expenseAccountDTO.getInOrderDisplay(), expenseAccountDTO.getOutOrderDisplay());
                 List<ExpenseAccountPO> contractList =
                         expenseAccountApplicationService.queryListFromContractWarehouseInOutSettlement(

mhd_bms/src/main/java/com/mhd/bms/application/server/settlementCustomers/SettlementCustomersApplicationService.java

@@ -376,4 +376,39 @@ public class SettlementCustomersApplicationService {
         }
         return null;
     }
+
+    /**
+     * 按结算主体ID（如货主用户ID，对应 settlement_entity_id）取一条结算对象，用于解析合同上的 settlement_customers_code。
+     * 多条时按 settlement_customers_id 升序取第一条。
+     *
+     * @param settlementEntityId 结算主体id，不可为空
+     * @param topOrganizationId  一级组织；为空则从当前登录用户取
+     */
+    public SettlementCustomersPO getFirstBySettlementEntityId(Long settlementEntityId, Long topOrganizationId) {
+        if (settlementEntityId == null) {
+            return null;
+        }
+        Long topOrg = topOrganizationId;
+        if (topOrg == null) {
+            LoginUser loginUser = SecurityUtils.getLoginUser();
+            if (loginUser != null && loginUser.getUserPo() != null) {
+                topOrg = loginUser.getUserPo().getTopOrganizationId();
+            }
+        }
+        LambdaQueryWrapper<SettlementCustomers> wrapper = new LambdaQueryWrapper<SettlementCustomers>()
+                .eq(SettlementCustomers::getSettlementEntityId, settlementEntityId)
+                .eq(SettlementCustomers::getDelFlag, 1)
+                .orderByAsc(SettlementCustomers::getSettlementCustomersId)
+                .last("LIMIT 1");
+        if (topOrg != null) {
+            wrapper.eq(SettlementCustomers::getTopOrganizationId, topOrg);
+        }
+        SettlementCustomers entity = settlementCustomersMapper.selectOne(wrapper);
+        if (entity == null) {
+            return null;
+        }
+        SettlementCustomersPO po = new SettlementCustomersPO();
+        BeanUtils.copyProperties(entity, po);
+        return po;
+    }
 }

mhd_bms/src/main/java/com/mhd/bms/interfaces/facadeApi/SettlementCustomersApi.java

@@ -123,6 +123,21 @@ public class SettlementCustomersApi extends BaseController{
         return AjaxResult.success(settlementCustomersApplicationService.getInfoByCode(settlementCustomersCode));
     }
 
+    /**
+     * 按结算主体ID（货主等业务主体ID，对应 settlement_entity_id）查询一条结算对象
+     */
+    @ApiOperation("按结算主体ID查询结算对象")
+    @GetMapping(value = "/getInfoBySettlementEntityId")
+    public AjaxResult getInfoBySettlementEntityId(
+            @RequestParam(value = "settlementEntityId", required = false) Long settlementEntityId,
+            @RequestParam(value = "topOrganizationId", required = false) Long topOrganizationId) {
+        if (settlementEntityId == null) {
+            return AjaxResult.error("缺少必传查询参数 settlementEntityId（货主/结算主体ID，对应 settlement_entity_id）。"
+                    + "GET 请求示例：/settlementCustomersApi/getInfoBySettlementEntityId?settlementEntityId=123456&topOrganizationId=你的租户一级组织ID");
+        }
+        return AjaxResult.success(settlementCustomersApplicationService.getFirstBySettlementEntityId(settlementEntityId, topOrganizationId));
+    }
+