feat(oms): 出/入仓委托单新增导入接口(委托单模板与W出入库管理导入一致)

出仓: POST /outEntrustOrderApi/import, EasyExcel两遍解析(前11行表头+第12行起明细), 客户名称解析货主, 明细按料号>SKU>品名匹配货主物料档案(料号不存在/规格/SKU不一致报错), 柜号/运输方式/监管方式字典转码, 校验通过复用新增链路落库(生成CKWT单号, 待审核/未下发); 入仓: POST /reservationStockInOrderApi/importData, 恢复原注释W式导入并按现行类型重写——POI标签扫描前12行表头+ExcelUtil读13行列名明细, 按委托编号NO分组建单, 料号必填且须在该货主下存在, 规格/SKU与档案一致性校验, 数量空行/容器行跳过, 计划数量=入库数量之和, 订单来源=数据导入; OutEntrustOrderMapper新增跨库物料直查(NGWL_TEST_WMS.MATERIAL_BASE_INFO, 货主+一级组织过滤)
2026-09-14 13:55:10 +08:00
parent e60f22979c
commit 888a293ebd
10 changed files with 1806 additions and 11 deletions
@@ -178,4 +178,29 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        </where>
    </select>

+    <!-- 导入用：跨库查询WMS物料基础信息(与reservationStockInOrder模块的直查模式一致),按货主+一级组织过滤 -->
+    <sql id="selectImportMaterialBaseInfo">
+        select * from "NGWL_TEST_WMS".MATERIAL_BASE_INFO
+        where DEL_FLAG = 1
+        and SHIPPER_ID = #{shipperId}
+        <if test="topOrganizationId != null">
+            and TOP_ORGANIZATION_ID = #{topOrganizationId}
+        </if>
+    </sql>
+
+    <select id="getMaterialByMaterialCode" resultType="com.mhd.oms.domain.reservationStockInOrder.repository.po.MaterialBaseInfoPO">
+        <include refid="selectImportMaterialBaseInfo"/>
+        and MATERIAL_CODE = #{materialCode}
+    </select>
+
+    <select id="getMaterialByBarCode" resultType="com.mhd.oms.domain.reservationStockInOrder.repository.po.MaterialBaseInfoPO">
+        <include refid="selectImportMaterialBaseInfo"/>
+        and BAR_CODE = #{barCode}
+    </select>
+
+    <select id="getMaterialByMaterialName" resultType="com.mhd.oms.domain.reservationStockInOrder.repository.po.MaterialBaseInfoPO">
+        <include refid="selectImportMaterialBaseInfo"/>
+        and MATERIAL_NAME = #{materialName}
+    </select>
+
 </mapper>