From b8605c6b431ed837de82af4dc5ff38e0d3999b0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Fri, 31 Jul 2026 17:12:24 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E7=BA=A6=E5=8D=95=E8=80=81=E7=B3=BB?= =?UTF-8?q?=E7=BB=9F=E6=95=B0=E6=8D=AE=E5=AF=BC=E5=85=A5;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ReserveStockInOrderApplicationService.java | 39 +++++++------------ .../ReserveStockInOrderMapper.xml | 2 +- .../ReserveStockOutOrderMapper.xml | 2 +- 3 files changed, 17 insertions(+), 26 deletions(-) diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockInOrder/service/ReserveStockInOrderApplicationService.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockInOrder/service/ReserveStockInOrderApplicationService.java index cbf30e381..571dfa51c 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockInOrder/service/ReserveStockInOrderApplicationService.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockInOrder/service/ReserveStockInOrderApplicationService.java @@ -31,6 +31,7 @@ import com.mhd.oms.domain.reserveStockInOrder.repository.vo.InAndOutListVo; import com.mhd.oms.domain.reserveStockInOrder.repository.vo.LegacyReserveInDetailVO; import com.mhd.oms.domain.reserveStockInOrder.repository.vo.LegacyReserveInOrderVO; import com.mhd.oms.domain.reserveStockInOrder.repository.vo.ReservedInventory; +import com.mhd.oms.domain.reserveStockOutOrder.repository.mapper.ReserveStockOutOrderMapper; import com.mhd.system.api.SystemServiceFeign; import com.mhd.system.api.UserServiceFeign; import com.mhd.system.api.WmsServiceFeign; @@ -68,6 +69,8 @@ public class ReserveStockInOrderApplicationService { @Autowired private ReserveStockInOrderMapper reserveStockInOrderMapper; @Autowired + private ReserveStockOutOrderMapper reserveStockOutOrderMapper; + @Autowired private ReservationMaterialInventoryMapper reservationMaterialInventoryMapper; @Autowired private UserServiceFeign userServiceFeign; @@ -2108,35 +2111,23 @@ public class ReserveStockInOrderApplicationService { } } - // 按仓库名称匹配仓库（查不到则按仓库类型兜底，再查不到则用名称兜底，不阻断导入） + // 按仓库类型匹配仓库（老系统仓库类型 1=干仓 2=冬仓，查不到则用类型名兜底） + String warehouseName = ""; WarehousePO warehouse = null; - String warehouseName = StringUtils.trimToEmpty(orderRow.getWarehouseName()); - if (StringUtils.isNotBlank(warehouseName)) { - warehouse = warehouseCache.get(warehouseName); + String warehouseType = StringUtils.trimToEmpty(orderRow.getWarehouseType()); + if (StringUtils.isNotBlank(warehouseType)) { + warehouse = warehouseTypeCache.get(warehouseType); if (warehouse == null) { - List warehousePOList = reserveStockInOrderMapper.getWarehouseByName(warehouseName); + List warehousePOList = reserveStockOutOrderMapper.getWarehouseByType(warehouseType); if (warehousePOList == null || warehousePOList.isEmpty()) { - // 名称匹配失败，尝试按仓库类型兜底匹配 - String warehouseType = StringUtils.trimToEmpty(orderRow.getWarehouseType()); - if (StringUtils.isNotBlank(warehouseType)) { - if (warehouseTypeCache.containsKey(warehouseType)) { - warehouse = warehouseTypeCache.get(warehouseType); - } else { - List typeList = reserveStockInOrderMapper.getWarehouseByType(warehouseType); - if (typeList != null && !typeList.isEmpty()) { - warehouse = typeList.get(0); - warehouseTypeCache.put(warehouseType, warehouse); - } else { - warehouseTypeCache.put(warehouseType, null); - } - } - } - if (warehouse == null) { - errorList.add("入库单号【" + orderNumber + "】仓库【" + warehouseName + "】未找到对应仓库，将仅以名称导入"); - } + warehouseName = "1".equals(warehouseType) ? "干仓" : ("2".equals(warehouseType) ? "冻仓" : ""); + errorList.add("出库单号【" + orderNumber + "】仓库类型【" + warehouseType + "】未找到对应仓库，将仅以名称导入"); + warehouseTypeCache.put(warehouseType, null); + warehouse = null; } else { warehouse = warehousePOList.get(0); - warehouseCache.put(warehouseName, warehouse); + warehouseName = warehouse.getWarehouseName(); + warehouseTypeCache.put(warehouseType, warehouse); } } } diff --git a/mhd_oms/src/main/resources/mapper/reserveStockInOrder/ReserveStockInOrderMapper.xml b/mhd_oms/src/main/resources/mapper/reserveStockInOrder/ReserveStockInOrderMapper.xml index ffdb7fdd4..2272d6a7d 100644 --- a/mhd_oms/src/main/resources/mapper/reserveStockInOrder/ReserveStockInOrderMapper.xml +++ b/mhd_oms/src/main/resources/mapper/reserveStockInOrder/ReserveStockInOrderMapper.xml @@ -815,7 +815,7 @@ where DEL_FLAG = 1 and ( WAREHOUSE_TYPE = #{warehouseType} - or WAREHOUSE_TYPE_NAME = case when #{warehouseType} = '1' then '干仓' when #{warehouseType} = '2' then '冬仓' else null end + or WAREHOUSE_TYPE_NAME = case when #{warehouseType} = '1' then '干仓' when #{warehouseType} = '2' then '冻仓' else null end ) diff --git a/mhd_oms/src/main/resources/mapper/reserveStockOutOrder/ReserveStockOutOrderMapper.xml b/mhd_oms/src/main/resources/mapper/reserveStockOutOrder/ReserveStockOutOrderMapper.xml index 8e0a52a6b..1c4a103dd 100644 --- a/mhd_oms/src/main/resources/mapper/reserveStockOutOrder/ReserveStockOutOrderMapper.xml +++ b/mhd_oms/src/main/resources/mapper/reserveStockOutOrder/ReserveStockOutOrderMapper.xml @@ -544,7 +544,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where DEL_FLAG = 1 and ( WAREHOUSE_TYPE = #{warehouseType} - or WAREHOUSE_TYPE_NAME = case when #{warehouseType} = '1' then '干仓' when #{warehouseType} = '2' then '冬仓' else null end + or WAREHOUSE_TYPE_NAME = case when #{warehouseType} = '1' then '干仓' when #{warehouseType} = '2' then '冻仓' else null end )