fix(oms): 物料解析防张冠李戴+导入三类校验合并报错，客户编码只认USER_MEMBER_CODE

一、出库业务单导入(ReservationStockInOrderImpl) - 物料不存在/客户不存在/批次库存不足三类校验全部收集完成后统一报错，不再分阶段中断 - materialCache 取用统一 trim，防 Excel 编号带空格导致校验被跳过二、物料三级解析防张冠李戴(MaterialBaseInfoResolveService) - baseId 按主键查到的档案与明细编码不一致时不再信任 baseId，转库存ID反查/编码+组织兜底，两级落空才退回按ID档案，命中打WARN日志 - 背景：前端把库存ID传进 materialBaseInfoId，撞上编码=名称的脏档案主键后整行物料被覆盖成错误物料三、客户编码口径(reservationStockOutOrder/ReservationStockOutOrderMapper.xml) - queryCustomerByCode 只认 USER.USER_MEMBER_CODE，不再放行 USER_SHIPPER.CUSTOMER_NC_CODE 四、明细查询补字段(reserveStockOutOrder/ReserveStockOutOrderMapper.xml) - resultMap 补 status/issue_status 映射，detailsList 查询补查 a.status, a.issue_status
2026-09-03 15:52:18 +08:00
parent 57312753ed
commit 4ad31a870a
4 changed files with 62 additions and 42 deletions
@@ -471,15 +471,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
    </resultMap>

    <!-- 按客户编号+组织查询客户（用户表）：出入库导入校验客户存在性并自动匹配客户名称，结果为空表示客户不存在。
-         客户编码有两处维护：USER.USER_MEMBER_CODE（客户编码）与 USER_SHIPPER.CUSTOMER_NC_CODE（NC客户代码，即单据khdm），
-         模板填写的客户编号两者任一命中即可匹配到客户 -->
+         客户编码只认 USER.USER_MEMBER_CODE（客户编码）；
+         2026-09-03 起不再放行 USER_SHIPPER.CUSTOMER_NC_CODE（NC客户代码），避免会员/NC编码撞车导致不存在的客户编号误通过 -->
    <select id="queryCustomerByCode" resultType="com.mhd.common.core.domain.po.UserPo">
        select max(u.user_id) as user_id, max(u.user_name) as user_name, max(u.user_member_code) as user_member_code
        from NGWL_TEST_USER."USER" u
-        left join NGWL_TEST_USER.USER_SHIPPER us
-            on us.USER_ID = u.USER_ID and us.DEL_FLAG = 1
        where u.ORGANIZATION_ID = #{organizationId} and u.DEL_FLAG = 1
-          and (u.USER_MEMBER_CODE = #{userMemberCode} or us.CUSTOMER_NC_CODE = #{userMemberCode})
+          and u.USER_MEMBER_CODE = #{userMemberCode}
    </select>

    <select id="countByOrderNumberPrefix" resultType="java.lang.Integer" parameterType="java.lang.String">