queryLineRankList(ExecutionOutboundRankDO executionOutboundRankDO) {
+ return executionOutboundRankMapper.queryLineRankList(executionOutboundRankDO);
+ }
+
+ @Override
+ public ExecutionOutboundRankTotalPO queryMaterialRankTotal(ExecutionOutboundRankDO executionOutboundRankDO) {
+ return executionOutboundRankMapper.queryMaterialRankTotal(executionOutboundRankDO);
+ }
+
+ @Override
+ public ExecutionOutboundRankTotalPO queryLineRankTotal(ExecutionOutboundRankDO executionOutboundRankDO) {
+ return executionOutboundRankMapper.queryLineRankTotal(executionOutboundRankDO);
+ }
+}
diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/outboundRank/repository/po/ExecutionOutboundLineRankPO.java b/mhd_oms/src/main/java/com/mhd/oms/domain/outboundRank/repository/po/ExecutionOutboundLineRankPO.java
new file mode 100644
index 000000000..974944f90
--- /dev/null
+++ b/mhd_oms/src/main/java/com/mhd/oms/domain/outboundRank/repository/po/ExecutionOutboundLineRankPO.java
@@ -0,0 +1,45 @@
+package com.mhd.oms.domain.outboundRank.repository.po;
+
+import com.mhd.common.core.annotation.Excel;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * 线路出库排名PO
+ *
+ * 按日期区间对出库单聚合：销售量=SUM(出库数量)，交易数=COUNT(DISTINCT 出库单号)，金额=SUM(明细总价)；
+ * 仅统计带线路的出库单（line_code 为 2026-08-20 新增冗余字段，历史单为空）
+ *
+ * @author rcx
+ * @date 2026-08-31
+ */
+@Data
+@ApiModel(value = "线路出库排名对象", description = "线路出库排名响应对象")
+public class ExecutionOutboundLineRankPO implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty("线路编码")
+ @Excel(name = "线路编码")
+ private String lineCode;
+
+ @ApiModelProperty("线路名称")
+ @Excel(name = "线路名称")
+ private String lineName;
+
+ @ApiModelProperty("销售量（出库数量合计）")
+ @Excel(name = "销售量")
+ private BigDecimal salesQuantity;
+
+ @ApiModelProperty("交易数（出库单据数）")
+ @Excel(name = "交易数")
+ private Long tradeCount;
+
+ @ApiModelProperty("金额")
+ @Excel(name = "金额")
+ private BigDecimal amount;
+}
diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/outboundRank/repository/po/ExecutionOutboundMaterialRankPO.java b/mhd_oms/src/main/java/com/mhd/oms/domain/outboundRank/repository/po/ExecutionOutboundMaterialRankPO.java
new file mode 100644
index 000000000..c32046d9f
--- /dev/null
+++ b/mhd_oms/src/main/java/com/mhd/oms/domain/outboundRank/repository/po/ExecutionOutboundMaterialRankPO.java
@@ -0,0 +1,52 @@
+package com.mhd.oms.domain.outboundRank.repository.po;
+
+import com.mhd.common.core.annotation.Excel;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * 商品出库排名PO
+ *
+ * 按日期区间对出库明细聚合：销售量=SUM(出库数量)，交易数=COUNT(DISTINCT 出库单号)，金额=SUM(明细总价)
+ *
+ * @author rcx
+ * @date 2026-08-31
+ */
+@Data
+@ApiModel(value = "商品出库排名对象", description = "商品出库排名响应对象")
+public class ExecutionOutboundMaterialRankPO implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty("商品货号")
+ @Excel(name = "商品货号")
+ private String materialCode;
+
+ @ApiModelProperty("商品名称")
+ @Excel(name = "商品名称")
+ private String materialName;
+
+ @ApiModelProperty("规格")
+ @Excel(name = "规格")
+ private String specificationModel;
+
+ @ApiModelProperty("单位")
+ @Excel(name = "单位")
+ private String unitName;
+
+ @ApiModelProperty("销售量（出库数量合计）")
+ @Excel(name = "销售量")
+ private BigDecimal salesQuantity;
+
+ @ApiModelProperty("交易数（出库单据数）")
+ @Excel(name = "交易数")
+ private Long tradeCount;
+
+ @ApiModelProperty("金额")
+ @Excel(name = "金额")
+ private BigDecimal amount;
+}
diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/outboundRank/repository/po/ExecutionOutboundRankTotalPO.java b/mhd_oms/src/main/java/com/mhd/oms/domain/outboundRank/repository/po/ExecutionOutboundRankTotalPO.java
new file mode 100644
index 000000000..7622c3593
--- /dev/null
+++ b/mhd_oms/src/main/java/com/mhd/oms/domain/outboundRank/repository/po/ExecutionOutboundRankTotalPO.java
@@ -0,0 +1,32 @@
+package com.mhd.oms.domain.outboundRank.repository.po;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * 出库排名合计PO
+ *
+ * 当前筛选条件下不分页的全量合计，随分页列表一起返回（totalSalesQuantity/totalTradeCount/totalAmount）
+ *
+ * @author rcx
+ * @date 2026-08-31
+ */
+@Data
+@ApiModel(value = "出库排名合计对象", description = "出库排名合计响应对象")
+public class ExecutionOutboundRankTotalPO implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty("销售量合计")
+ private BigDecimal totalSalesQuantity;
+
+ @ApiModelProperty("交易数合计（去重出库单数）")
+ private Long totalTradeCount;
+
+ @ApiModelProperty("金额合计")
+ private BigDecimal totalAmount;
+}
diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/outboundRank/repository/todo/ExecutionOutboundRankDO.java b/mhd_oms/src/main/java/com/mhd/oms/domain/outboundRank/repository/todo/ExecutionOutboundRankDO.java
new file mode 100644
index 000000000..83e8064ce
--- /dev/null
+++ b/mhd_oms/src/main/java/com/mhd/oms/domain/outboundRank/repository/todo/ExecutionOutboundRankDO.java
@@ -0,0 +1,50 @@
+package com.mhd.oms.domain.outboundRank.repository.todo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 出库排名统计查询DO
+ *
+ * topOrganizationId 由服务端按登录用户注入，前端不传
+ *
+ * @author rcx
+ * @date 2026-08-31
+ */
+@Data
+public class ExecutionOutboundRankDO implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty("出库日期-开始 yyyy-MM-dd（必填）")
+ private String createTimeStart;
+
+ @ApiModelProperty("出库日期-结束 yyyy-MM-dd（必填）")
+ private String createTimeEnd;
+
+ @ApiModelProperty("商品货号（模糊）")
+ private String materialCode;
+
+ @ApiModelProperty("商品名称（模糊）")
+ private String materialName;
+
+ @ApiModelProperty("线路编码（模糊）")
+ private String lineCode;
+
+ @ApiModelProperty("线路名称（模糊）")
+ private String lineName;
+
+ @ApiModelProperty("仓库名称（模糊）")
+ private String warehouseName;
+
+ @ApiModelProperty("客户名称（模糊）")
+ private String customerName;
+
+ @ApiModelProperty("货主名称（模糊）")
+ private String shipperName;
+
+ @ApiModelProperty("一级组织表ID（登录用户隔离，非1时注入）")
+ private Long topOrganizationId;
+}
diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/outboundRank/repository/todo/ExecutionOutboundRankDTO.java b/mhd_oms/src/main/java/com/mhd/oms/domain/outboundRank/repository/todo/ExecutionOutboundRankDTO.java
new file mode 100644
index 000000000..0637173b7
--- /dev/null
+++ b/mhd_oms/src/main/java/com/mhd/oms/domain/outboundRank/repository/todo/ExecutionOutboundRankDTO.java
@@ -0,0 +1,46 @@
+package com.mhd.oms.domain.outboundRank.repository.todo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 出库排名统计入参DTO
+ *
+ * 按日期区间统计商品/线路出库量排名。OMS 库出库单状态不流转（无"已出库"数据），
+ * 数据源跨库取 WMS 库出库表（NGWL_TEST_WMS.stock_out_order / out_material_detail），与 WMS 端 /outboundRankApi 同口径
+ *
+ * @author rcx
+ * @date 2026-08-31
+ */
+@Data
+public class ExecutionOutboundRankDTO {
+
+ @ApiModelProperty("出库日期-开始 yyyy-MM-dd（必填，按出库单创建时间统计）")
+ private String createTimeStart;
+
+ @ApiModelProperty("出库日期-结束 yyyy-MM-dd（必填，按出库单创建时间统计）")
+ private String createTimeEnd;
+
+ @ApiModelProperty("商品货号（模糊）")
+ private String materialCode;
+
+ @ApiModelProperty("商品名称（模糊）")
+ private String materialName;
+
+ @ApiModelProperty("线路编码（模糊）")
+ private String lineCode;
+
+ @ApiModelProperty("线路名称（模糊）")
+ private String lineName;
+
+ @ApiModelProperty("仓库名称（模糊）")
+ private String warehouseName;
+
+ @ApiModelProperty("客户名称（模糊）")
+ private String customerName;
+
+ @ApiModelProperty("货主名称（模糊）")
+ private String shipperName;
+}
diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/outboundRank/service/ExecutionOutboundRankApplicationService.java b/mhd_oms/src/main/java/com/mhd/oms/domain/outboundRank/service/ExecutionOutboundRankApplicationService.java
new file mode 100644
index 000000000..158f2b8c2
--- /dev/null
+++ b/mhd_oms/src/main/java/com/mhd/oms/domain/outboundRank/service/ExecutionOutboundRankApplicationService.java
@@ -0,0 +1,93 @@
+package com.mhd.oms.domain.outboundRank.service;
+
+import com.mhd.common.core.exception.ServiceException;
+import com.mhd.common.core.utils.StringUtils;
+import com.mhd.common.security.utils.SecurityUtils;
+import com.mhd.system.api.model.LoginUser;
+import com.mhd.oms.domain.outboundRank.repository.po.ExecutionOutboundLineRankPO;
+import com.mhd.oms.domain.outboundRank.repository.po.ExecutionOutboundMaterialRankPO;
+import com.mhd.oms.domain.outboundRank.repository.po.ExecutionOutboundRankTotalPO;
+import com.mhd.oms.domain.outboundRank.repository.todo.ExecutionOutboundRankDO;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 出库排名统计应用服务
+ *
+ * 负责登录用户组织隔离注入、日期区间校验，统计逻辑在 ExecutionOutboundRankDomainService → ExecutionOutboundRankMapper.xml（跨库取 WMS 出库数据）
+ *
+ * @author rcx
+ * @date 2026-08-31
+ */
+@Service
+@Slf4j
+public class ExecutionOutboundRankApplicationService {
+
+ @Autowired
+ private ExecutionOutboundRankDomainService executionOutboundRankDomainService;
+
+ /**
+ * 分页查询商品出库排名列表
+ */
+ public List queryMaterialRankList(ExecutionOutboundRankDO executionOutboundRankDO) {
+ fillLoginContext(executionOutboundRankDO);
+ return executionOutboundRankDomainService.queryMaterialRankList(executionOutboundRankDO);
+ }
+
+ /**
+ * 分页查询线路出库排名列表
+ */
+ public List queryLineRankList(ExecutionOutboundRankDO executionOutboundRankDO) {
+ fillLoginContext(executionOutboundRankDO);
+ return executionOutboundRankDomainService.queryLineRankList(executionOutboundRankDO);
+ }
+
+ /**
+ * 商品出库排名合计（当前筛选条件全量，不分页）
+ */
+ public ExecutionOutboundRankTotalPO queryMaterialRankTotal(ExecutionOutboundRankDO executionOutboundRankDO) {
+ return executionOutboundRankDomainService.queryMaterialRankTotal(executionOutboundRankDO);
+ }
+
+ /**
+ * 线路出库排名合计（当前筛选条件全量，不分页）
+ */
+ public ExecutionOutboundRankTotalPO queryLineRankTotal(ExecutionOutboundRankDO executionOutboundRankDO) {
+ return executionOutboundRankDomainService.queryLineRankTotal(executionOutboundRankDO);
+ }
+
+ /**
+ * 导出商品出库排名（不分页全量）
+ */
+ public List exportMaterialRankList(ExecutionOutboundRankDO executionOutboundRankDO) {
+ fillLoginContext(executionOutboundRankDO);
+ return executionOutboundRankDomainService.queryMaterialRankList(executionOutboundRankDO);
+ }
+
+ /**
+ * 导出线路出库排名（不分页全量）
+ */
+ public List exportLineRankList(ExecutionOutboundRankDO executionOutboundRankDO) {
+ fillLoginContext(executionOutboundRankDO);
+ return executionOutboundRankDomainService.queryLineRankList(executionOutboundRankDO);
+ }
+
+ /**
+ * 注入登录用户组织隔离，并校验日期区间必填
+ */
+ private void fillLoginContext(ExecutionOutboundRankDO executionOutboundRankDO) {
+ if (StringUtils.isEmpty(executionOutboundRankDO.getCreateTimeStart()) || StringUtils.isEmpty(executionOutboundRankDO.getCreateTimeEnd())) {
+ throw new ServiceException("请选择统计日期区间");
+ }
+ LoginUser loginUser = SecurityUtils.getLoginUser();
+ if (loginUser != null && loginUser.getUserPo() != null) {
+ Long topOrganizationId = loginUser.getUserPo().getTopOrganizationId();
+ if (topOrganizationId != null && topOrganizationId != 1) {
+ executionOutboundRankDO.setTopOrganizationId(topOrganizationId);
+ }
+ }
+ }
+}
diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/outboundRank/service/ExecutionOutboundRankAssembler.java b/mhd_oms/src/main/java/com/mhd/oms/domain/outboundRank/service/ExecutionOutboundRankAssembler.java
new file mode 100644
index 000000000..88ec8e165
--- /dev/null
+++ b/mhd_oms/src/main/java/com/mhd/oms/domain/outboundRank/service/ExecutionOutboundRankAssembler.java
@@ -0,0 +1,36 @@
+package com.mhd.oms.domain.outboundRank.service;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.mhd.common.core.exception.digitalLogisticsException.DigitalLogisticsException;
+import com.mhd.common.core.exception.digitalLogisticsException.UserError;
+import com.mhd.common.core.utils.IgnoreNullUtil;
+import com.mhd.common.core.utils.bean.BeanUtils;
+import com.mhd.common.security.utils.SecurityUtils;
+import com.mhd.system.api.model.LoginUser;
+import com.mhd.oms.domain.outboundRank.repository.todo.ExecutionOutboundRankDO;
+import com.mhd.oms.domain.outboundRank.repository.todo.ExecutionOutboundRankDTO;
+import org.springframework.stereotype.Component;
+
+/**
+ * 出库排名统计Assembler
+ *
+ * @author rcx
+ * @date 2026-08-31
+ */
+@Component
+public class ExecutionOutboundRankAssembler {
+
+ /**
+ * 转换实体
+ */
+ public ExecutionOutboundRankDO toDO(ExecutionOutboundRankDTO executionOutboundRankDTO) {
+ ExecutionOutboundRankDO executionOutboundRankDO = new ExecutionOutboundRankDO();
+ // 拷贝
+ BeanUtils.copyProperties(executionOutboundRankDTO, executionOutboundRankDO, IgnoreNullUtil.getNullPropertyNames(executionOutboundRankDTO));
+ LoginUser loginUser = SecurityUtils.getLoginUser();
+ if (ObjectUtil.isNull(loginUser)) {
+ throw new DigitalLogisticsException(UserError.TIMEOUT);
+ }
+ return executionOutboundRankDO;
+ }
+}
diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/outboundRank/service/ExecutionOutboundRankDomainService.java b/mhd_oms/src/main/java/com/mhd/oms/domain/outboundRank/service/ExecutionOutboundRankDomainService.java
new file mode 100644
index 000000000..ce87d4968
--- /dev/null
+++ b/mhd_oms/src/main/java/com/mhd/oms/domain/outboundRank/service/ExecutionOutboundRankDomainService.java
@@ -0,0 +1,54 @@
+package com.mhd.oms.domain.outboundRank.service;
+
+import com.mhd.oms.domain.outboundRank.repository.facade.IExecutionOutboundRankService;
+import com.mhd.oms.domain.outboundRank.repository.po.ExecutionOutboundLineRankPO;
+import com.mhd.oms.domain.outboundRank.repository.po.ExecutionOutboundMaterialRankPO;
+import com.mhd.oms.domain.outboundRank.repository.po.ExecutionOutboundRankTotalPO;
+import com.mhd.oms.domain.outboundRank.repository.todo.ExecutionOutboundRankDO;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 出库排名统计领域服务
+ *
+ * @author rcx
+ * @date 2026-08-31
+ */
+@Service
+@Slf4j
+public class ExecutionOutboundRankDomainService {
+
+ @Autowired
+ private IExecutionOutboundRankService executionOutboundRankService;
+
+ /**
+ * 商品出库排名列表
+ */
+ public List queryMaterialRankList(ExecutionOutboundRankDO executionOutboundRankDO) {
+ return executionOutboundRankService.queryMaterialRankList(executionOutboundRankDO);
+ }
+
+ /**
+ * 线路出库排名列表
+ */
+ public List queryLineRankList(ExecutionOutboundRankDO executionOutboundRankDO) {
+ return executionOutboundRankService.queryLineRankList(executionOutboundRankDO);
+ }
+
+ /**
+ * 商品出库排名合计（不分页）
+ */
+ public ExecutionOutboundRankTotalPO queryMaterialRankTotal(ExecutionOutboundRankDO executionOutboundRankDO) {
+ return executionOutboundRankService.queryMaterialRankTotal(executionOutboundRankDO);
+ }
+
+ /**
+ * 线路出库排名合计（不分页）
+ */
+ public ExecutionOutboundRankTotalPO queryLineRankTotal(ExecutionOutboundRankDO executionOutboundRankDO) {
+ return executionOutboundRankService.queryLineRankTotal(executionOutboundRankDO);
+ }
+}
diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationMaterialInventory/entity/ReservationMaterialInventory.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationMaterialInventory/entity/ReservationMaterialInventory.java
index e75764b66..41d50c856 100644
--- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationMaterialInventory/entity/ReservationMaterialInventory.java
+++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationMaterialInventory/entity/ReservationMaterialInventory.java
@@ -210,6 +210,12 @@ public class ReservationMaterialInventory extends BaseVOEntity {
@Excel(name = "存货日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date inventoryDate;
+ @ApiModelProperty("进货日期")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "进货日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ private Date purchaseDate;
+
@ApiModelProperty("ExtAttr3")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationMaterialInventory/repository/facade/IReservationMaterialInventoryService.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationMaterialInventory/repository/facade/IReservationMaterialInventoryService.java
index 5344f3163..bd81f1a21 100644
--- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationMaterialInventory/repository/facade/IReservationMaterialInventoryService.java
+++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationMaterialInventory/repository/facade/IReservationMaterialInventoryService.java
@@ -2,6 +2,7 @@ package com.mhd.oms.domain.reservationMaterialInventory.repository.facade;
import com.baomidou.mybatisplus.extension.service.IService;
import com.mhd.oms.domain.reservationMaterialInventory.entity.ReservationMaterialInventory;
+import com.mhd.oms.domain.reservationMaterialInventory.repository.po.MaterialInventoryExpiryBatchPO;
import com.mhd.oms.domain.reservationMaterialInventory.repository.po.ReservationMaterialInventoryPO;
import com.mhd.oms.domain.reservationMaterialInventory.repository.po.ReservationMaterialInventoryQueryListPO;
import com.mhd.oms.domain.reservationMaterialInventory.repository.todo.MaterialInventoryParamDO;
@@ -113,4 +114,9 @@ public interface IReservationMaterialInventoryService extends IService selectRecentExpiryBatches(String materialCode, Long topOrganizationId);
}
\ No newline at end of file
diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationMaterialInventory/repository/mapper/ReservationMaterialInventoryMapper.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationMaterialInventory/repository/mapper/ReservationMaterialInventoryMapper.java
index e655c623d..a73033a6b 100644
--- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationMaterialInventory/repository/mapper/ReservationMaterialInventoryMapper.java
+++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationMaterialInventory/repository/mapper/ReservationMaterialInventoryMapper.java
@@ -2,6 +2,7 @@ package com.mhd.oms.domain.reservationMaterialInventory.repository.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.mhd.oms.domain.reservationMaterialInventory.entity.ReservationMaterialInventory;
+import com.mhd.oms.domain.reservationMaterialInventory.repository.po.MaterialInventoryExpiryBatchPO;
import com.mhd.oms.domain.reservationMaterialInventory.repository.po.ReservationMaterialInventoryPO;
import com.mhd.oms.domain.reservationMaterialInventory.repository.todo.MaterialBarCodePO;
import com.mhd.oms.domain.reservationMaterialInventory.repository.todo.MaterialBaseInfo;
@@ -36,4 +37,7 @@ public interface ReservationMaterialInventoryMapper extends BaseMapper getInfoByMaterialBaseInfoIds(@Param("id") Long id);
+
+ //入库业务单新增：根据物料编号查询库存批次去重后的过期日期+批次号（最近5条），供前端下拉回显
+ public List selectRecentExpiryBatches(@Param("materialCode") String materialCode, @Param("topOrganizationId") Long topOrganizationId);
}
\ No newline at end of file
diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationMaterialInventory/repository/persistence/ReservationMaterialInventoryImpl.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationMaterialInventory/repository/persistence/ReservationMaterialInventoryImpl.java
index 508bf043b..d666fc65a 100644
--- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationMaterialInventory/repository/persistence/ReservationMaterialInventoryImpl.java
+++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationMaterialInventory/repository/persistence/ReservationMaterialInventoryImpl.java
@@ -13,6 +13,7 @@ import com.mhd.oms.domain.reservationInventoryAdjustmentRecord.repository.mapper
import com.mhd.oms.domain.reservationMaterialInventory.entity.ReservationMaterialInventory;
import com.mhd.oms.domain.reservationMaterialInventory.repository.facade.IReservationMaterialInventoryService;
import com.mhd.oms.domain.reservationMaterialInventory.repository.mapper.ReservationMaterialInventoryMapper;
+import com.mhd.oms.domain.reservationMaterialInventory.repository.po.MaterialInventoryExpiryBatchPO;
import com.mhd.oms.domain.reservationMaterialInventory.repository.po.ReservationMaterialInventoryPO;
import com.mhd.oms.domain.reservationMaterialInventory.repository.po.ReservationMaterialInventoryQueryListPO;
import com.mhd.oms.domain.reservationMaterialInventory.repository.todo.MaterialBarCodePO;
@@ -120,6 +121,14 @@ public class ReservationMaterialInventoryImpl extends ServiceImpl selectRecentExpiryBatches(String materialCode, Long topOrganizationId) {
+ return materialInventoryMapper.selectRecentExpiryBatches(materialCode, topOrganizationId);
+ }
+
@Override
public Boolean omsEdit(MaterialInventoryOmsParamDO materialInventoryOmsParamDO) {
String inOrderNumber = materialInventoryOmsParamDO.getInOrderNumber();
@@ -127,6 +136,9 @@ public class ReservationMaterialInventoryImpl extends ServiceImpl param = new LambdaQueryWrapper()
// .eq(ReservationMaterialInventory::getInOrderNumber, inOrderNumber)
//.eq(ReservationMaterialInventory::getLotNumber, lotNumber)
@@ -148,6 +160,11 @@ public class ReservationMaterialInventoryImpl extends ServiceImpl reservationMaterialInventories = materialInventoryMapper.selectList(param);
if (reservationMaterialInventories != null && reservationMaterialInventories.size() > 0) {
ReservationMaterialInventory reservationMaterialInventory = reservationMaterialInventories.get(0);
@@ -542,6 +559,7 @@ public class ReservationMaterialInventoryImpl extends ServiceImpl selectRecentExpiryBatches(String materialCode) {
+ Long topOrganizationId = null;
+ LoginUser loginUser = SecurityUtils.getLoginUser();
+ if (loginUser != null && loginUser.getUserPo() != null) {
+ Long loginTopOrgId = loginUser.getUserPo().getTopOrganizationId();
+ if (loginTopOrgId != null && loginTopOrgId != 1) {
+ topOrganizationId = loginTopOrgId;
+ }
+ }
+ return materialInventoryDomainService.selectRecentExpiryBatches(materialCode, topOrganizationId);
+ }
+
/**
* @description:库存查询列表
* @param materialInventoryQueryListDO
diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationMaterialInventory/service/ReservationMaterialInventoryDomainService.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationMaterialInventory/service/ReservationMaterialInventoryDomainService.java
index fc73a5f42..40cc12ad1 100644
--- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationMaterialInventory/service/ReservationMaterialInventoryDomainService.java
+++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationMaterialInventory/service/ReservationMaterialInventoryDomainService.java
@@ -3,6 +3,7 @@ package com.mhd.oms.domain.reservationMaterialInventory.service;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.mhd.oms.domain.reservationMaterialInventory.entity.ReservationMaterialInventory;
import com.mhd.oms.domain.reservationMaterialInventory.repository.facade.IReservationMaterialInventoryService;
+import com.mhd.oms.domain.reservationMaterialInventory.repository.po.MaterialInventoryExpiryBatchPO;
import com.mhd.oms.domain.reservationMaterialInventory.repository.po.ReservationMaterialInventoryPO;
import com.mhd.oms.domain.reservationMaterialInventory.repository.po.ReservationMaterialInventoryQueryListPO;
import com.mhd.oms.domain.reservationMaterialInventory.repository.todo.ReservationMaterialInventoryDO;
@@ -88,6 +89,13 @@ public class ReservationMaterialInventoryDomainService {
return materialInventory.getInventoryQuantity();
}
+ /**
+ * 根据物料编号查询库存批次最近5条过期日期+批次号（入库业务单新增页面下拉回显）
+ */
+ public List selectRecentExpiryBatches(String materialCode, Long topOrganizationId) {
+ return materialInventoryService.selectRecentExpiryBatches(materialCode, topOrganizationId);
+ }
+
/**
* @description:库存查询列表
* @param materialInventoryQueryListDO
diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/listener/DynamicDeliveryExcelListener.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/listener/DynamicDeliveryExcelListener.java
index 9b898afb5..07ae79d33 100644
--- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/listener/DynamicDeliveryExcelListener.java
+++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/listener/DynamicDeliveryExcelListener.java
@@ -21,20 +21,47 @@ import java.util.Map;
/**
* 维他奶出库Excel解析监听器（新模板版）
* 新模板特点：货品明细与客户配送明细左右分栏展示
- * 核心功能：
- * 1. 左侧栏：第1-3行解析表头（送货日期/送货线号/车次），第5行解析纪录合共，第7行起解析货品明细
- * 2. 右侧栏：第2行解析发票张数/小计，第4行起解析客户配送明细
- * 3. 自动处理文本型数字转换（String→Integer/BigDecimal）
- * 4. 完整的异常处理和日志记录
+ * 核心功能（行列位置均不写死，模板调整行/列顺序不影响解析）：
+ * 1. 表头标签（送货日期/送货线号/车次/发票张数/小计/纪录合共）：按标签文字定位标签所在列，取右侧相邻列的值
+ * 2. 货品明细：按列头文字（貨品編號/簡稱/箱/支等，繁简体归一化）定位各列，列头行之后的行按数据解析
+ * 3. 客户配送明细：按列头文字（類别/發票編號/客户編號/名稱/箱/包/金額等）定位各列
+ * 4. 列头行识别失败时兜底：按老模板固定布局（左栏A-D列、右栏F-L列、行号1-7）解析，保证老模板不受影响
+ * 5. 自动处理文本型数字转换（String→Integer/BigDecimal）
*/
public class DynamicDeliveryExcelListener extends AnalysisEventListener> {
// 日志实例
private static final Logger LOGGER = LoggerFactory.getLogger(DynamicDeliveryExcelListener.class);
- // 关键字定义（Excel标签匹配）
- private static final String KEYWORD_TOTAL_RECORD = "紀錄合共";
- private static final String KEYWORD_INVOICE_COUNT = "發票張數";
- private static final String KEYWORD_SUBTOTAL = "小計";
+ // ---------------------- 关键字/列头别名定义（归一化后匹配，兼容简繁体） ----------------------
+ // 表头标签关键字
+ private static final String[] KEYWORD_DELIVERY_DATE = {"送货日期"};
+ private static final String[] KEYWORD_DELIVERY_LINE = {"送货线号", "送货线路"};
+ private static final String[] KEYWORD_TRAIN = {"车次"};
+ private static final String[] KEYWORD_TOTAL_RECORD = {"纪录合共"};
+ private static final String[] KEYWORD_INVOICE_COUNT = {"发票张数"};
+ private static final String[] KEYWORD_SUBTOTAL = {"小计"};
+
+ // 货品明细列头别名
+ private static final String[] PRODUCT_CODE_ALIASES = {"货品编号", "产品编号", "物料编号", "货品编码", "产品编码", "物料编码", "料号"};
+ private static final String[] PRODUCT_NAME_ALIASES = {"简称", "货品名称", "产品名称", "物料名称", "品名", "名称"};
+ private static final String[] PRODUCT_BOX_ALIASES = {"箱数", "箱"};
+ private static final String[] PRODUCT_PIECE_ALIASES = {"支数", "件数", "支"};
+
+ // 客户配送明细列头别名
+ private static final String[] CATEGORY_ALIASES = {"类别"};
+ private static final String[] INVOICE_NO_ALIASES = {"发票编号", "发票号", "发票"};
+ private static final String[] CUSTOMER_CODE_ALIASES = {"客户编号", "客户编码", "客户代码"};
+ private static final String[] CUSTOMER_NAME_ALIASES = {"客户名称", "名称"};
+ private static final String[] CUSTOMER_BOX_ALIASES = {"箱数", "箱"};
+ private static final String[] CUSTOMER_PACKAGE_ALIASES = {"包数", "包"};
+ private static final String[] CUSTOMER_AMOUNT_ALIASES = {"金额", "总额"};
+
+ // 列头行认定门槛：锚点列（编号列）必须识别到，且识别列总数达标，防止数据行误判为列头行
+ private static final int HEADER_MIN_MATCH_COUNT = 2;
+ // 老模板兜底：货品明细数据固定从第7行、客户配送明细数据固定从第4行开始（列头未识别到时启用固定列位）
+ private static final int PRODUCT_DATA_START_ROW = 7;
+ private static final int CUSTOMER_DATA_START_ROW = 4;
+
// 支持的日期格式（String转Date）
private static final String[] SUPPORTED_DATE_FORMATS = {"yyyy-MM-dd", "yyyy/MM/dd", "yyyyMMdd", "yyyy-MM-dd HH:mm:ss"};
@@ -43,6 +70,26 @@ public class DynamicDeliveryExcelListener extends AnalysisEventListener productDetailList = new ArrayList<>();
private final List customerDeliveryDetailList = new ArrayList<>();
+ // 货品明细列索引（-1表示未识别该列）
+ private int productCodeCol = -1;
+ private int productNameCol = -1;
+ private int productBoxCol = -1;
+ private int productPieceCol = -1;
+ private boolean productColumnsResolved = false;
+
+ // 客户配送明细列索引（-1表示未识别该列）
+ private int categoryCol = -1;
+ private int invoiceNoCol = -1;
+ private int customerCodeCol = -1;
+ private int customerNameCol = -1;
+ private int customerBoxCol = -1;
+ private int customerPackageCol = -1;
+ private int customerAmountCol = -1;
+ private boolean customerColumnsResolved = false;
+
+ // 发票张数/小计行是否已解析
+ private boolean invoiceRowParsed = false;
+
// 当前行号（1-based，与Excel行号一致）
private int currentRowNum = 0;
@@ -53,10 +100,10 @@ public class DynamicDeliveryExcelListener extends AnalysisEventListener data) {
- switch (currentRowNum) {
- case 1:
- // 第1行：送货日期（A列=标签，B列=值）
- parseDeliveryDate(data);
- break;
- case 2:
- // 第2行：送货线号（A列=标签，B列=值）
- parseDeliveryLineNo(data);
- break;
- case 3:
- // 第3行：车次（A列=标签，B列=值）
- parseTrainNumber(data);
- break;
- case 4:
- // 第4行：货品明细标题行，无需解析
- LOGGER.debug("第{}行：货品明细标题行，跳过", currentRowNum);
- break;
- case 5:
- // 第5行：纪录合共（A列=标签，B列=总记录数，D列=总箱数，E列=总支数）
- parseTotalRecord(data);
- break;
- case 6:
- // 第6行：货品明细列标题（貨品編號/簡稱/箱/支），跳过
- LOGGER.debug("第{}行：货品明细列标题行，跳过", currentRowNum);
- break;
- default:
- // 第7行起：货品明细数据行（遇到空行自动结束）
- if (currentRowNum >= 7 && isValidProductDetailRow(data)) {
- parseProductDetail(data, currentRowNum);
- }
- break;
+ // 1. 表头标签：送货日期/送货线号/车次（按标签文字定位，行位置不限）
+ parseHeaderLabels(data);
+ // 2. 纪录合共（按标签文字定位，行位置不限）
+ parseTotalRecord(data);
+ // 3. 货品明细：列布局已确定时按数据行解析
+ if (productColumnsResolved) {
+ if (isValidProductDetailRow(data)) {
+ parseProductDetail(data, currentRowNum);
+ }
+ return;
+ }
+ // 4. 尝试识别货品明细列头行；识别成功则本行即列头行，跳过数据解析
+ if (tryResolveProductColumns(data)) {
+ return;
+ }
+ // 5. 超过老模板数据起始行仍未识别到列头行：启用固定列位兜底，从当前行开始按数据行解析
+ if (currentRowNum >= PRODUCT_DATA_START_ROW) {
+ applyProductFallbackColumns();
+ if (isValidProductDetailRow(data)) {
+ parseProductDetail(data, currentRowNum);
+ }
}
}
// ---------------------- 右侧区域解析（客户配送相关信息） ----------------------
private void parseRightSection(Map data) {
- switch (currentRowNum) {
- case 1:
- // 第1行：客户配送明细标题行，无需解析
- LOGGER.debug("第{}行：客户配送明细标题行，跳过", currentRowNum);
- break;
- case 2:
- // 第2行：发票张数/小计（F列=發票張數标签，G列=数值；J列=小計标签，K/L/M列=数值）
- parseInvoiceCount(data);
- break;
- case 3:
- // 第3行：客户配送明细列标题（類别/發票編號/客户編號/名稱/箱/包/金額），跳过
- LOGGER.debug("第{}行：客户配送明细列标题行，跳过", currentRowNum);
- break;
- default:
- // 第4行起：客户配送明细数据行（遇到空行自动结束）
- if (currentRowNum >= 4 && isValidCustomerDetailRow(data)) {
- parseCustomerDeliveryDetail(data, currentRowNum);
- }
- break;
+ // 1. 发票张数/小计（按标签文字定位，行位置不限，解析成功后不再重复解析）
+ if (!invoiceRowParsed) {
+ parseInvoiceRow(data);
+ }
+ // 2. 客户配送明细：列布局已确定时按数据行解析
+ if (customerColumnsResolved) {
+ if (isValidCustomerDetailRow(data)) {
+ parseCustomerDeliveryDetail(data, currentRowNum);
+ }
+ return;
+ }
+ // 3. 尝试识别客户配送明细列头行；识别成功则本行即列头行，跳过数据解析
+ if (tryResolveCustomerColumns(data)) {
+ return;
+ }
+ // 4. 超过老模板数据起始行仍未识别到列头行：启用固定列位兜底，从当前行开始按数据行解析
+ if (currentRowNum >= CUSTOMER_DATA_START_ROW) {
+ applyCustomerFallbackColumns();
+ if (isValidCustomerDetailRow(data)) {
+ parseCustomerDeliveryDetail(data, currentRowNum);
+ }
}
}
// ---------------------- 解析完成回调 ----------------------
@Override
public void doAfterAllAnalysed(AnalysisContext context) {
+ // 小计标签始终未识别到时保持与原逻辑一致：小计相关字段置0
+ if (deliveryHeader.getSubtotalAmount() == null) {
+ LOGGER.warn("未找到【小计】标签，小计信息置空");
+ deliveryHeader.setSubtotalBoxCount(0);
+ deliveryHeader.setSubtotalPieceCount(0);
+ deliveryHeader.setSubtotalAmount(BigDecimal.ZERO);
+ }
LOGGER.info("Excel解析全部完成！最终统计结果：");
LOGGER.info("1. 表头信息：送货日期={}，送货线号={}，车次={}，发票张数={}，总记录数={}，小计金额={}",
deliveryHeader.getDeliveryDate(),
@@ -144,47 +190,52 @@ public class DynamicDeliveryExcelListener extends AnalysisEventListener data) {
- Object value = getValueSafely(data, 1); // B列
- if (value != null) {
- Date deliveryDate = convertToDate(value);
- deliveryHeader.setDeliveryDate(deliveryDate);
- LOGGER.debug("第{}行：送货日期解析完成，值={}", currentRowNum, deliveryDate);
+ // ---------------------- 左侧：表头信息解析（标签定位，行位置不限） ----------------------
+ private void parseHeaderLabels(Map data) {
+ // 送货日期
+ if (deliveryHeader.getDeliveryDate() == null) {
+ Integer keywordIndex = findKeywordIndex(data, KEYWORD_DELIVERY_DATE);
+ if (keywordIndex != null) {
+ Date deliveryDate = convertToDate(getValueSafely(data, keywordIndex + 1));
+ if (deliveryDate != null) {
+ deliveryHeader.setDeliveryDate(deliveryDate);
+ LOGGER.debug("第{}行：送货日期解析完成，值={}", currentRowNum, deliveryDate);
+ }
+ }
+ }
+ // 送货线号
+ if (deliveryHeader.getDeliveryLineNo() == null || deliveryHeader.getDeliveryLineNo().trim().isEmpty()) {
+ Integer keywordIndex = findKeywordIndex(data, KEYWORD_DELIVERY_LINE);
+ if (keywordIndex != null) {
+ Object value = getValueSafely(data, keywordIndex + 1);
+ if (value != null && !value.toString().trim().isEmpty()) {
+ deliveryHeader.setDeliveryLineNo(value.toString().trim());
+ LOGGER.debug("第{}行：送货线号解析完成，值={}", currentRowNum, deliveryHeader.getDeliveryLineNo());
+ }
+ }
+ }
+ // 车次
+ if (deliveryHeader.getTrainNumber() == null) {
+ Integer keywordIndex = findKeywordIndex(data, KEYWORD_TRAIN);
+ if (keywordIndex != null) {
+ deliveryHeader.setTrainNumber(convertToInteger(getValueSafely(data, keywordIndex + 1)));
+ LOGGER.debug("第{}行：车次解析完成，值={}", currentRowNum, deliveryHeader.getTrainNumber());
+ }
}
}
- private void parseDeliveryLineNo(Map data) {
- Object value = getValueSafely(data, 1); // B列
- if (value != null) {
- String deliveryLineNo = value.toString().trim();
- deliveryHeader.setDeliveryLineNo(deliveryLineNo);
- LOGGER.debug("第{}行：送货线号解析完成，值={}", currentRowNum, deliveryLineNo);
- }
- }
-
- private void parseTrainNumber(Map data) {
- Object value = getValueSafely(data, 1); // B列
- Integer trainNumber = convertToInteger(value);
- deliveryHeader.setTrainNumber(trainNumber);
- LOGGER.debug("第{}行：车次解析完成，值={}", currentRowNum, trainNumber);
- }
-
- // ---------------------- 左侧：纪录合共解析 ----------------------
+ // ---------------------- 左侧：纪录合共解析（标签定位，行位置不限） ----------------------
/**
- * 第5行：纪录合共
- * 列对应关系：0=A列=紀錄合共标签，1=B列=总记录数，3=D列=总箱数，4=E列=总支数
+ * 纪录合共：标签右侧第1列=总记录数，第3列=总箱数，第4列=总支数（与老模板B/D/E列偏移一致）
*/
private void parseTotalRecord(Map data) {
- Object totalRecordLabel = getValueSafely(data, 0);
- if (totalRecordLabel == null || !totalRecordLabel.toString().trim().contains(KEYWORD_TOTAL_RECORD)) {
- LOGGER.warn("第{}行：不是纪录合共行，跳过解析，第一列内容：{}", currentRowNum, totalRecordLabel);
+ Integer keywordIndex = findKeywordIndex(data, KEYWORD_TOTAL_RECORD);
+ if (keywordIndex == null) {
return;
}
-
- Integer totalRecordCount = convertToInteger(getValueSafely(data, 1)); // B列
- Integer totalBoxCount = convertToInteger(getValueSafely(data, 3)); // D列
- Integer totalPieceCount = convertToInteger(getValueSafely(data, 4)); // E列
+ Integer totalRecordCount = convertToInteger(getValueSafely(data, keywordIndex + 1));
+ Integer totalBoxCount = convertToInteger(getValueSafely(data, keywordIndex + 3));
+ Integer totalPieceCount = convertToInteger(getValueSafely(data, keywordIndex + 4));
deliveryHeader.setTotalRecordCount(totalRecordCount);
deliveryHeader.setTotalBoxCount(totalBoxCount);
@@ -194,27 +245,66 @@ public class DynamicDeliveryExcelListener extends AnalysisEventListener data) {
- Object productCode = getValueSafely(data, 0); // A列
- return productCode != null
- && !productCode.toString().trim().isEmpty()
- && !"貨品編號".equals(productCode.toString().trim());
+ private boolean tryResolveProductColumns(Map data) {
+ int codeCol = findColumnByAliases(data, PRODUCT_CODE_ALIASES);
+ if (codeCol < 0) {
+ return false;
+ }
+ int nameCol = findColumnByAliases(data, PRODUCT_NAME_ALIASES);
+ int boxCol = findColumnByAliases(data, PRODUCT_BOX_ALIASES);
+ int pieceCol = findColumnByAliases(data, PRODUCT_PIECE_ALIASES);
+ int matched = 1 + (nameCol >= 0 ? 1 : 0) + (boxCol >= 0 ? 1 : 0) + (pieceCol >= 0 ? 1 : 0);
+ if (matched < HEADER_MIN_MATCH_COUNT) {
+ return false;
+ }
+ productCodeCol = codeCol;
+ productNameCol = nameCol;
+ productBoxCol = boxCol;
+ productPieceCol = pieceCol;
+ productColumnsResolved = true;
+ LOGGER.info("第{}行识别为货品明细列头行，列映射：货品编号={}，名称={}，箱={}，支={}",
+ currentRowNum, productCodeCol, productNameCol, productBoxCol, productPieceCol);
+ return true;
}
/**
- * 解析货品明细（第7行起）
- * 列对应关系：0=A列=貨品編號，1=B列=簡稱，2=C列=箱，3=D列=支
+ * 兜底列位：老模板货品明细固定布局（0=A列=貨品編號，1=B列=簡稱，2=C列=箱，3=D列=支）
+ */
+ private void applyProductFallbackColumns() {
+ productCodeCol = 0;
+ productNameCol = 1;
+ productBoxCol = 2;
+ productPieceCol = 3;
+ productColumnsResolved = true;
+ LOGGER.warn("第{}行前未识别到货品明细列头行，启用老模板固定列位兜底解析", currentRowNum);
+ }
+
+ /**
+ * 校验货品明细行是否有效（排除列头行和空行）
+ */
+ private boolean isValidProductDetailRow(Map data) {
+ Object productCode = getValueSafely(data, productCodeCol);
+ if (productCode == null || productCode.toString().trim().isEmpty()) {
+ return false;
+ }
+ // 列头文字本身不算数据行（防止列头行被当作数据重复解析）
+ String text = normalizeHeaderText(productCode);
+ return !matchesAny(text, PRODUCT_CODE_ALIASES);
+ }
+
+ /**
+ * 解析货品明细（列头行之后的行）
*/
private void parseProductDetail(Map data, int rowNum) {
ProductDetail productDetail = new ProductDetail();
- productDetail.setProductCode(convertToString(getValueSafely(data, 0)));
- productDetail.setProductName(convertToString(getValueSafely(data, 1)));
- productDetail.setBoxCount(convertToInteger(getValueSafely(data, 2)));
- productDetail.setPieceCount(convertToInteger(getValueSafely(data, 3)));
+ productDetail.setProductCode(convertToString(getValueSafely(data, productCodeCol)));
+ productDetail.setProductName(convertToString(getValueSafely(data, productNameCol)));
+ productDetail.setBoxCount(convertToInteger(getValueSafely(data, productBoxCol)));
+ productDetail.setPieceCount(convertToInteger(getValueSafely(data, productPieceCol)));
productDetailList.add(productDetail);
LOGGER.debug("第{}行：解析货品明细完成，货品编号={}，名称={}，箱数={}，支数={}",
@@ -222,67 +312,105 @@ public class DynamicDeliveryExcelListener extends AnalysisEventListener data) {
- // 1. 定位并解析发票张数
- Integer invoiceCount = findValueAfterKeyword(data, KEYWORD_INVOICE_COUNT);
- if (invoiceCount != null) {
- deliveryHeader.setInvoiceCount(invoiceCount);
+ // ---------------------- 右侧：发票张数与小计解析（标签定位，行位置不限） ----------------------
+ private void parseInvoiceRow(Map data) {
+ // 1. 发票张数：标签右侧相邻列
+ Integer invoiceIndex = findKeywordIndex(data, KEYWORD_INVOICE_COUNT);
+ if (invoiceIndex != null) {
+ deliveryHeader.setInvoiceCount(convertToInteger(getValueSafely(data, invoiceIndex + 1)));
}
- // 2. 定位并解析小计（标签右侧第1列=箱，第2列=支，第3列=金额）
- Integer subtotalStartIndex = findKeywordIndex(data, KEYWORD_SUBTOTAL);
- if (subtotalStartIndex != null && subtotalStartIndex >= 0) {
- Integer subtotalBoxCount = convertToInteger(getValueSafely(data, subtotalStartIndex + 1));
- Integer subtotalPieceCount = convertToInteger(getValueSafely(data, subtotalStartIndex + 2));
- BigDecimal subtotalAmount = convertToBigDecimal(getValueSafely(data, subtotalStartIndex + 3));
+ // 2. 小计：标签右侧第1列=箱，第2列=支，第3列=金额
+ Integer subtotalIndex = findKeywordIndex(data, KEYWORD_SUBTOTAL);
+ if (subtotalIndex != null && subtotalIndex >= 0) {
+ Integer subtotalBoxCount = convertToInteger(getValueSafely(data, subtotalIndex + 1));
+ Integer subtotalPieceCount = convertToInteger(getValueSafely(data, subtotalIndex + 2));
+ BigDecimal subtotalAmount = convertToBigDecimal(getValueSafely(data, subtotalIndex + 3));
deliveryHeader.setSubtotalBoxCount(subtotalBoxCount);
deliveryHeader.setSubtotalPieceCount(subtotalPieceCount);
deliveryHeader.setSubtotalAmount(subtotalAmount);
+ invoiceRowParsed = true;
- LOGGER.debug("第{}行：解析小计完成，箱数={}，支数={}，金额={}",
- currentRowNum, subtotalBoxCount, subtotalPieceCount, subtotalAmount);
- } else {
- LOGGER.warn("第{}行：未找到小计标签，小计信息置空", currentRowNum);
- deliveryHeader.setSubtotalBoxCount(0);
- deliveryHeader.setSubtotalPieceCount(0);
- deliveryHeader.setSubtotalAmount(BigDecimal.ZERO);
+ LOGGER.debug("第{}行：解析发票张数行完成，发票张数={}，小计箱数={}，支数={}，金额={}",
+ currentRowNum, deliveryHeader.getInvoiceCount(), subtotalBoxCount, subtotalPieceCount, subtotalAmount);
}
-
- LOGGER.debug("第{}行：解析发票张数行完成，发票张数={}，小计金额={}",
- currentRowNum, deliveryHeader.getInvoiceCount(), deliveryHeader.getSubtotalAmount());
}
- // ---------------------- 右侧：客户配送明细解析 ----------------------
+ // ---------------------- 右侧：客户配送明细列头识别与数据解析 ----------------------
/**
- * 校验客户配送明细行是否有效（排除表头和空行）
+ * 尝试将当前行识别为客户配送明细列头行：以客户编号列为锚点，按列头文字（简繁归一化）匹配各列
+ */
+ private boolean tryResolveCustomerColumns(Map data) {
+ int codeCol = findColumnByAliases(data, CUSTOMER_CODE_ALIASES);
+ if (codeCol < 0) {
+ return false;
+ }
+ int categoryColTmp = findColumnByAliases(data, CATEGORY_ALIASES);
+ int invoiceNoColTmp = findColumnByAliases(data, INVOICE_NO_ALIASES);
+ int nameColTmp = findColumnByAliases(data, CUSTOMER_NAME_ALIASES);
+ int boxColTmp = findColumnByAliases(data, CUSTOMER_BOX_ALIASES);
+ int packageColTmp = findColumnByAliases(data, CUSTOMER_PACKAGE_ALIASES);
+ int amountColTmp = findColumnByAliases(data, CUSTOMER_AMOUNT_ALIASES);
+ int matched = 1 + (categoryColTmp >= 0 ? 1 : 0) + (invoiceNoColTmp >= 0 ? 1 : 0) + (nameColTmp >= 0 ? 1 : 0)
+ + (boxColTmp >= 0 ? 1 : 0) + (packageColTmp >= 0 ? 1 : 0) + (amountColTmp >= 0 ? 1 : 0);
+ if (matched < HEADER_MIN_MATCH_COUNT) {
+ return false;
+ }
+ categoryCol = categoryColTmp;
+ invoiceNoCol = invoiceNoColTmp;
+ customerCodeCol = codeCol;
+ customerNameCol = nameColTmp;
+ customerBoxCol = boxColTmp;
+ customerPackageCol = packageColTmp;
+ customerAmountCol = amountColTmp;
+ customerColumnsResolved = true;
+ LOGGER.info("第{}行识别为客户配送明细列头行，列映射：类别={}，发票编号={}，客户编号={}，名称={}，箱={}，包={}，金额={}",
+ currentRowNum, categoryCol, invoiceNoCol, customerCodeCol, customerNameCol, customerBoxCol, customerPackageCol, customerAmountCol);
+ return true;
+ }
+
+ /**
+ * 兜底列位：老模板客户配送明细固定布局（5=F列=類别，6=G列=發票編號，7=H列=客户編號，8=I列=名稱，
+ * 9=J列=箱，10=K列=包，11=L列=金額）
+ */
+ private void applyCustomerFallbackColumns() {
+ categoryCol = 5;
+ invoiceNoCol = 6;
+ customerCodeCol = 7;
+ customerNameCol = 8;
+ customerBoxCol = 9;
+ customerPackageCol = 10;
+ customerAmountCol = 11;
+ customerColumnsResolved = true;
+ LOGGER.warn("第{}行前未识别到客户配送明细列头行，启用老模板固定列位兜底解析", currentRowNum);
+ }
+
+ /**
+ * 校验客户配送明细行是否有效（排除列头行和空行）
*/
private boolean isValidCustomerDetailRow(Map data) {
- Object category = getValueSafely(data, 5); // F列
- return category != null
- && !category.toString().trim().isEmpty()
- && !"類别".equals(category.toString().trim());
+ Object category = getValueSafely(data, categoryCol);
+ if (category == null || category.toString().trim().isEmpty()) {
+ return false;
+ }
+ // 列头文字本身不算数据行（防止列头行被当作数据重复解析）
+ String text = normalizeHeaderText(category);
+ return !matchesAny(text, CATEGORY_ALIASES);
}
/**
- * 解析客户配送明细（第4行起）
- * 列对应关系：5=F列=類别，6=G列=發票編號，7=H列=客户編號，8=I列=名稱，
- * 9=J列=箱，10=K列=包，11=L列=金額
+ * 解析客户配送明细（列头行之后的行）
*/
private void parseCustomerDeliveryDetail(Map data, int rowNum) {
CustomerDeliveryDetail customerDetail = new CustomerDeliveryDetail();
- customerDetail.setCategory(convertToString(getValueSafely(data, 5)));
- customerDetail.setInvoiceNo(convertToString(getValueSafely(data, 6)));
- customerDetail.setCustomerCode(convertToString(getValueSafely(data, 7)));
- customerDetail.setCustomerName(convertToString(getValueSafely(data, 8)));
- customerDetail.setBoxCount(convertToInteger(getValueSafely(data, 9)));
- customerDetail.setPackageCount(convertToInteger(getValueSafely(data, 10)));
- customerDetail.setAmount(convertToBigDecimal(getValueSafely(data, 11)));
+ customerDetail.setCategory(convertToString(getValueSafely(data, categoryCol)));
+ customerDetail.setInvoiceNo(convertToString(getValueSafely(data, invoiceNoCol)));
+ customerDetail.setCustomerCode(convertToString(getValueSafely(data, customerCodeCol)));
+ customerDetail.setCustomerName(convertToString(getValueSafely(data, customerNameCol)));
+ customerDetail.setBoxCount(convertToInteger(getValueSafely(data, customerBoxCol)));
+ customerDetail.setPackageCount(convertToInteger(getValueSafely(data, customerPackageCol)));
+ customerDetail.setAmount(convertToBigDecimal(getValueSafely(data, customerAmountCol)));
customerDeliveryDetailList.add(customerDetail);
LOGGER.debug("第{}行：解析客户配送明细完成，类别={}，发票编号={}，客户编号={}，名称={}，箱数={}，包数={}，金额={}",
@@ -299,7 +427,7 @@ public class DynamicDeliveryExcelListener extends AnalysisEventListener data, int columnIndex) {
- if (data == null || data.isEmpty()) {
+ if (columnIndex < 0 || data == null || data.isEmpty()) {
return null;
}
@@ -333,9 +461,9 @@ public class DynamicDeliveryExcelListener extends AnalysisEventListener data, String keyword) {
- if (data == null || data.isEmpty() || keyword == null) {
+ private Integer findKeywordIndex(Map data, String[] keywords) {
+ if (data == null || data.isEmpty() || keywords == null) {
return null;
}
for (Object keyObj : data.keySet()) {
Object value = data.get(keyObj);
- if (value != null && value.toString().trim().contains(keyword)) {
+ if (value == null) {
+ continue;
+ }
+ String text = normalizeHeaderText(value);
+ if (text.isEmpty()) {
+ continue;
+ }
+ if (matchesAny(text, keywords)) {
try {
return Integer.parseInt(keyObj.toString());
} catch (NumberFormatException e) {
- // key不是数字（可能是表头文本如"客户配送明细"），跳过，不打印警告避免日志刷屏
- LOGGER.debug("第{}行：关键字'{}'所在列key不是数字，key={}，跳过",
- currentRowNum, keyword, keyObj);
+ // key不是数字（可能是表头文本），跳过，不打印警告避免日志刷屏
+ LOGGER.debug("第{}行：关键字所在列key不是数字，key={}，跳过", currentRowNum, keyObj);
}
}
}
@@ -366,15 +500,64 @@ public class DynamicDeliveryExcelListener extends AnalysisEventListener data, String keyword) {
- Integer keywordIndex = findKeywordIndex(data, keyword);
- if (keywordIndex == null) {
- LOGGER.warn("第{}行：未找到关键字'{}'", currentRowNum, keyword);
- return null;
+ private int findColumnByAliases(Map data, String[] aliases) {
+ if (data == null || data.isEmpty() || aliases == null) {
+ return -1;
}
- return convertToInteger(getValueSafely(data, keywordIndex + 1));
+ for (Object keyObj : data.keySet()) {
+ Object value = data.get(keyObj);
+ if (value == null) {
+ continue;
+ }
+ String text = normalizeHeaderText(value);
+ if (text.isEmpty()) {
+ continue;
+ }
+ if (matchesAny(text, aliases)) {
+ try {
+ return Integer.parseInt(keyObj.toString());
+ } catch (NumberFormatException e) {
+ // key不是数字（可能是表头文本），跳过
+ LOGGER.debug("第{}行：列头所在列key不是数字，key={}，跳过", currentRowNum, keyObj);
+ }
+ }
+ }
+ return -1;
+ }
+
+ /**
+ * 列头/标签文字归一化：去空格/冒号/括号等符号、转小写、繁体转简体（覆盖模板常见用字）
+ */
+ private String normalizeHeaderText(Object value) {
+ if (value == null) {
+ return "";
+ }
+ String s = value.toString().trim().toLowerCase();
+ s = s.replace("：", "").replace(":", "")
+ .replace(" ", "").replace(" ", "")
+ .replace("(", "").replace(")", "")
+ .replace("（", "").replace("）", "")
+ .replace("/", "").replace("\\", "");
+ s = s.replace('貨', '货').replace('編', '编').replace('號', '号').replace('稱', '称')
+ .replace('數', '数').replace('飲', '饮').replace('規', '规').replace('戶', '户')
+ .replace('紀', '纪').replace('錄', '录').replace('張', '张').replace('計', '计')
+ .replace('車', '车').replace('線', '线').replace('類', '类').replace('別', '别')
+ .replace('簡', '简').replace('產', '产').replace('單', '单');
+ return s;
+ }
+
+ /**
+ * 判断归一化后的文字是否命中任一别名
+ */
+ private boolean matchesAny(String text, String[] aliases) {
+ for (String alias : aliases) {
+ if (text.contains(alias)) {
+ return true;
+ }
+ }
+ return false;
}
/**
diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/listener/StockInExcelListener.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/listener/StockInExcelListener.java
index c7df783b9..f8493da8c 100644
--- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/listener/StockInExcelListener.java
+++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/listener/StockInExcelListener.java
@@ -17,7 +17,11 @@ import java.util.Map;
/**
* 入库单Excel解析监听器
- * 功能：1. 解析第一行表头数据 2. 跳过第二行合计行、第三行列名行 3. 解析第四行开始的产品明细 4. 支持文本型数字转换
+ * 功能：1. 解析第一行表头数据（入库日期、OrderNO，按标签定位，位置不敏感）
+ * 2. 动态定位列头行：扫描前几行，识别出"產品編號"等已知列头文字的行即认定为列头行（行位置不敏感）
+ * 3. 列按列头文字动态定位（兼容繁体列头：產品編號/客戶編號/件數/飲用日期等），列顺序调整不影响解析
+ * 4. 列头无法识别时兜底：按老模板固定列位（0=编号，1=名称，2=规格，3=件数，4=饮用日期）
+ * 5. 支持文本型数字转换
*/
public class StockInExcelListener extends AnalysisEventListener> {
private static final Logger LOGGER = LoggerFactory.getLogger(StockInExcelListener.class);
@@ -35,6 +39,29 @@ public class StockInExcelListener extends AnalysisEventListener= 4) {
- if (isValidProductRow(data)) {
- StockInProductDetail detail = parseProductDetail(data);
- productDetailList.add(detail);
+ // 2. 列布局未确定：尝试识别列头行；识别成功则本行即为列头行，跳过数据解析
+ else if (!columnResolved) {
+ if (!tryResolveHeaderRow(data)) {
+ // 3. 超过老模板列头行位置仍未识别到列头行：启用固定列位兜底，从当前行开始按数据行解析
+ if (currentRowNum > FALLBACK_AFTER_ROW_NUM) {
+ applyFallbackColumns();
+ parseDataRow(data);
+ }
+ // 否则（合计行Total等）：跳过
}
}
+ // 4. 列布局已确定：按数据行解析
+ else {
+ parseDataRow(data);
+ }
} catch (ExcelDataConvertException e) {
// Excel内置转换异常（如日期格式错误）
@@ -79,6 +106,16 @@ public class StockInExcelListener extends AnalysisEventListener data) {
+ if (isValidProductRow(data)) {
+ StockInProductDetail detail = parseProductDetail(data);
+ productDetailList.add(detail);
+ }
+ }
+
/**
* 解析第一行表头数据
* 模板中标签与值相邻，分别搜索"入库日期"和"OrderNO"标签后一列的值，兼容位置调整
@@ -86,15 +123,17 @@ public class StockInExcelListener extends AnalysisEventListener data) {
// 入库日期：查找包含"入库日期"标签的下一个值
Object stockInDateObj = getValueAfterLabel(data, "入庫日期：");
+ if (stockInDateObj == null) {
+ stockInDateObj = getValueAfterLabel(data, "入库日期");
+ }
if (stockInDateObj != null) {
Date stockInDate = convertToDate(stockInDateObj);
stockInHeader.setStockInDate(stockInDate);
LOGGER.debug("第1行：入库日期解析完成，值：{}", stockInDate);
}
- // OrderNO：优先查找"OrderNO"标签后的值（老模板布局，标签与值相邻）；
- // 新模板第1行无"OrderNO"标签，单号值直接放在单元格中(如E1)，
- // 此时取第1行中除标签、入库日期以外的第一个非空字符串值
+ // OrderNO：优先查找"OrderNO"标签后的值（标签与值相邻）；
+ // 新模板第1行无"OrderNO"标签时，取第1行中除标签、入库日期以外的第一个非空字符串值
Object orderNoObj = getValueAfterLabel(data, "OrderNO");
if (orderNoObj == null) {
for (Object value : data.values()) {
@@ -103,7 +142,7 @@ public class StockInExcelListener extends AnalysisEventListener data) {
+ if (data == null || data.isEmpty()) {
+ return false;
+ }
+ int tmpProductCodeCol = -1;
+ int tmpProductNameCol = -1;
+ int tmpCustomerCodeCol = -1;
+ int tmpDrinkDateCol = -1;
+ int tmpPieceCountCol = -1;
+ int tmpSpecCol = -1;
+ int matched = 0;
+
+ for (Object keyObj : data.keySet()) {
+ Object value = data.get(keyObj);
+ if (value == null) {
+ continue;
+ }
+ String text = normalizeHeaderText(value);
+ if (text.isEmpty()) {
+ continue;
+ }
+ int colIndex;
+ try {
+ colIndex = Integer.parseInt(keyObj.toString());
+ } catch (NumberFormatException e) {
+ // key不是数字（如表头文本），跳过
+ continue;
+ }
+ // 按组依次匹配（先具体后一般，避免同一列头命中多组别名时归属错乱）
+ if (tmpProductCodeCol < 0 && matchesAny(text, PRODUCT_CODE_ALIASES)) {
+ tmpProductCodeCol = colIndex;
+ matched++;
+ } else if (tmpCustomerCodeCol < 0 && matchesAny(text, CUSTOMER_CODE_ALIASES)) {
+ tmpCustomerCodeCol = colIndex;
+ matched++;
+ } else if (tmpProductNameCol < 0 && matchesAny(text, PRODUCT_NAME_ALIASES)) {
+ tmpProductNameCol = colIndex;
+ matched++;
+ } else if (tmpDrinkDateCol < 0 && matchesAny(text, DRINK_DATE_ALIASES)) {
+ tmpDrinkDateCol = colIndex;
+ matched++;
+ } else if (tmpPieceCountCol < 0 && matchesAny(text, PIECE_COUNT_ALIASES)) {
+ tmpPieceCountCol = colIndex;
+ matched++;
+ } else if (tmpSpecCol < 0 && matchesAny(text, SPEC_ALIASES)) {
+ tmpSpecCol = colIndex;
+ matched++;
+ }
+ }
+
+ // 产品编号列是数据解析的锚点，必须识别到；且识别总数达标才认定为列头行
+ if (tmpProductCodeCol < 0 || matched < HEADER_MIN_MATCH_COUNT) {
+ return false;
+ }
+
+ productCodeCol = tmpProductCodeCol;
+ productNameCol = tmpProductNameCol;
+ customerCodeCol = tmpCustomerCodeCol;
+ drinkDateCol = tmpDrinkDateCol;
+ pieceCountCol = tmpPieceCountCol;
+ specCol = tmpSpecCol;
+ columnResolved = true;
+ LOGGER.info("第{}行识别为列头行，列映射：产品编号={}，产品名称={}，客户编号={}，规格={}，件数={}，饮用日期={}",
+ currentRowNum, productCodeCol, productNameCol, customerCodeCol, specCol, pieceCountCol, drinkDateCol);
+ return true;
+ }
+
+ /**
+ * 兜底列位：老模板固定布局（0=编号，1=名称，2=规格，3=件数，4=饮用日期），无客户编号列
+ */
+ private void applyFallbackColumns() {
+ productCodeCol = 0;
+ productNameCol = 1;
+ customerCodeCol = -1;
+ specCol = 2;
+ pieceCountCol = 3;
+ drinkDateCol = 4;
+ columnResolved = true;
+ LOGGER.warn("第{}行前未识别到列头行，启用老模板固定列位兜底解析", currentRowNum);
+ }
+
/**
* 解析产品明细数据（一行对应一个产品）
- * 新模板列顺序：0=产品编号，1=产品名称，2=规格（箱含量），3=件数，4=饮用日期
+ * 各列按列头行动态定位的索引取值，未识别的列取null/默认值
*/
private StockInProductDetail parseProductDetail(Map data) {
StockInProductDetail detail = new StockInProductDetail();
- // 产品编号（第1列，索引0）- 支持文本型数字转换
- detail.setProductCode(convertToString(getValueSafely(data, 0)));
- // 产品名称（第2列，索引1）
- detail.setProductName(convertToString(getValueSafely(data, 1)));
- // 箱含量/规格（第3列，索引2）
- detail.setBoxCapacity(convertToInteger(getValueSafely(data, 2)));
- // 件数（第4列，索引3）
- detail.setPieceCount(convertToInteger(getValueSafely(data, 3)));
- // 饮用日期（第5列，索引4）
- detail.setDrinkDate(convertToDate(getValueSafely(data, 4)));
+ // 产品编号（可不填名称，导入时按编号自动匹配库中物料名称）
+ detail.setProductCode(convertToString(getValueSafely(data, productCodeCol)));
+ // 产品名称（列头未识别或单元格未填时为空串，由服务端按编号自动匹配覆盖）
+ detail.setProductName(convertToString(getValueSafely(data, productNameCol)));
+ // 客户编号（新模板新增列，可不填；填写后由服务端校验客户存在性并自动匹配客户名称）
+ detail.setCustomerCode(convertToString(getValueSafely(data, customerCodeCol)));
+ // 箱含量/规格
+ detail.setBoxCapacity(convertToInteger(getValueSafely(data, specCol)));
+ // 件数
+ detail.setPieceCount(convertToInteger(getValueSafely(data, pieceCountCol)));
+ // 饮用日期
+ detail.setDrinkDate(convertToDate(getValueSafely(data, drinkDateCol)));
- LOGGER.debug("第{}行产品明细解析完成，产品编号：{}，产品名称：{}",
- currentRowNum, detail.getProductCode(), detail.getProductName());
+ LOGGER.debug("第{}行产品明细解析完成，产品编号：{}，产品名称：{}，客户编号：{}",
+ currentRowNum, detail.getProductCode(), detail.getProductName(), detail.getCustomerCode());
return detail;
}
@@ -152,9 +278,6 @@ public class StockInExcelListener extends AnalysisEventListener data) {
- // 有效条件：产品编号不为空 + 不是合计行
- Object productCodeObj = getValueSafely(data, 0);
-
// 排除合计行（整行包含"Total"字样）
if (containsAnyValue(data, "Total")) {
LOGGER.debug("第{}行是合计行，跳过解析", currentRowNum);
@@ -162,6 +285,7 @@ public class StockInExcelListener extends AnalysisEventListener data, int columnIndex) {
- if (data == null || data.isEmpty()) {
+ if (columnIndex < 0 || data == null || data.isEmpty()) {
return null;
}
+ String strIndex = String.valueOf(columnIndex);
+ // 1. 直接按key查找（key为String或Integer，跳过非数字key）
+ for (Object keyObj : data.keySet()) {
+ if (keyObj != null && strIndex.equals(keyObj.toString())) {
+ return data.get(keyObj);
+ }
+ }
+
+ // 2. 兜底：按顺序位置查找
int index = 0;
for (Object value : data.values()) {
if (index == columnIndex) {
@@ -193,7 +328,7 @@ public class StockInExcelListener extends AnalysisEventListener getProductDetailList() {
return productDetailList;
}
-}
\ No newline at end of file
+}
diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/persistence/ReservationStockInOrderImpl.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/persistence/ReservationStockInOrderImpl.java
index 5116ef9b0..20176fe04 100644
--- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/persistence/ReservationStockInOrderImpl.java
+++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/persistence/ReservationStockInOrderImpl.java
@@ -172,10 +172,10 @@ public class ReservationStockInOrderImpl extends ServiceImpl> shipperIds = new ArrayList<>();
Set processedShipperIds = new HashSet<>();
+ // ====== 第一步：物料编号存在性校验（落库前，先收集全部缺失编号，不立即报错） ======
+ Map materialCache = new LinkedHashMap<>();
+ List missingMaterials = new ArrayList<>();
for (ProductDetail productDetail : productDetailList) {
- MaterialBaseInfoPO materialBaseInfoPO = stockInOrderMapper.getByCode(productDetail.getProductCode(),loginUser.getUserPo().getOrganizationId());
- if (materialBaseInfoPO != null && materialBaseInfoPO.getShipperId() != null) {
- Long shipperId = materialBaseInfoPO.getShipperId();
- if (processedShipperIds.add(shipperId)) {
- Map shipper = new HashMap<>();
- shipper.put("shipperId", shipperId);
- shipper.put("shipperName", materialBaseInfoPO.getShipperName());
- shipper.put("shipperCode", materialBaseInfoPO.getShipperCode());
- shipperIds.add(shipper);
- }
+ String productCode = productDetail.getProductCode() == null ? "" : productDetail.getProductCode().trim();
+ if (productCode.isEmpty()) {
+ throw new Exception("出库明细存在未填写產品編號的行，请补全后重新导入");
+ }
+ if (materialCache.containsKey(productCode)) {
+ continue;
+ }
+ MaterialBaseInfoPO materialBaseInfoPO = stockInOrderMapper.getByCode(productCode, loginUser.getUserPo().getOrganizationId());
+ if (materialBaseInfoPO == null) {
+ missingMaterials.add(productCode);
+ } else {
+ materialCache.put(productCode, materialBaseInfoPO);
+ }
+ }
+
+ // ====== 第二步：客户编号存在性校验（落库前，先收集全部缺失编号，不立即报错） ======
+ Map customerCache = new HashMap<>();
+ List missingCustomers = new ArrayList<>();
+ for (CustomerDeliveryDetail customerDeliveryDetail : customerDeliveryDetailList) {
+ String customerCode = customerDeliveryDetail.getCustomerCode() == null ? "" : customerDeliveryDetail.getCustomerCode().trim();
+ if (customerCode.isEmpty()) {
+ throw new Exception("客户配送明细存在未填写客户编号的行，请补全后重新导入");
+ }
+ if (customerCache.containsKey(customerCode)) {
+ continue;
+ }
+ UserPo customer = stockOutOrderMapper.queryCustomerByCode(customerCode, loginUser.getUserPo().getOrganizationId());
+ if (customer == null || customer.getUserId() == null) {
+ missingCustomers.add(customerCode);
+ } else {
+ customerCache.put(customerCode, customer);
+ }
+ }
+
+ // ====== 第三步：物料/客户存在性校验全部完成后，统一提示两类编号各自有哪些不存在 ======
+ if (!missingMaterials.isEmpty() || !missingCustomers.isEmpty()) {
+ List problems = new ArrayList<>();
+ if (!missingMaterials.isEmpty()) {
+ problems.add("物料[" + String.join("、", missingMaterials) + "]不存在，请先维护物料信息");
+ }
+ if (!missingCustomers.isEmpty()) {
+ problems.add("客户[" + String.join("、", missingCustomers) + "]不存在，请先维护客户信息");
+ }
+ throw new Exception(String.join("；", problems) + "，维护完成后重新导入");
+ }
+
+ // ====== 后续处理（编号均已存在）：货主归属校验、建单落库 ======
+ for (MaterialBaseInfoPO materialBaseInfoPO : materialCache.values()) {
+ if (materialBaseInfoPO.getShipperId() != null && processedShipperIds.add(materialBaseInfoPO.getShipperId())) {
+ Map shipper = new HashMap<>();
+ shipper.put("shipperId", materialBaseInfoPO.getShipperId());
+ shipper.put("shipperName", materialBaseInfoPO.getShipperName());
+ shipper.put("shipperCode", materialBaseInfoPO.getShipperCode());
+ shipperIds.add(shipper);
}
}
@@ -330,7 +377,8 @@ public class ReservationStockInOrderImpl extends ServiceImpl productDetailList = resultDTO.getProductDetailList();
+ if (productDetailList == null || productDetailList.isEmpty()) {
+ throw new ServiceException("未解析到产品明细数据，请检查模板中是否填写了產品編號");
+ }
+ StockInHeader stockInHeader = resultDTO.getStockInHeader();
+ // ====== 第一步：物料编号存在性校验（模板只填物料编号即可，名称按编号自动匹配） ======
+ // 查询结果为空说明库中没有该物料，先收集全部缺失编号，不立即报错
+ Map materialCache = new LinkedHashMap<>();
+ List missingMaterials = new ArrayList<>();
+ for (StockInProductDetail productDetail : productDetailList) {
+ String productCode = productDetail.getProductCode();
+ if (materialCache.containsKey(productCode)) {
+ continue;
+ }
+ MaterialBaseInfoPO materialBaseInfoPO = stockInOrderMapper.getByCode(productCode, loginUser.getUserPo().getOrganizationId());
+ if (materialBaseInfoPO == null) {
+ missingMaterials.add(productCode);
+ } else {
+ materialCache.put(productCode, materialBaseInfoPO);
+ }
+ }
+ // ====== 第二步：客户编号存在性校验：先收集全部缺失编号，不立即报错 ======
+ Set customerCodes = new LinkedHashSet<>();
+ for (StockInProductDetail productDetail : productDetailList) {
+ if (productDetail.getCustomerCode() != null && !productDetail.getCustomerCode().trim().isEmpty()) {
+ customerCodes.add(productDetail.getCustomerCode().trim());
+ }
+ }
+ Map customerCache = new HashMap<>();
+ List missingCustomers = new ArrayList<>();
+ for (String customerCode : customerCodes) {
+ UserPo customer = stockOutOrderMapper.queryCustomerByCode(customerCode, loginUser.getUserPo().getOrganizationId());
+ if (customer == null || customer.getUserId() == null) {
+ missingCustomers.add(customerCode);
+ } else {
+ customerCache.put(customerCode, customer);
+ }
+ }
+ // ====== 第三步：物料/客户存在性校验全部完成后，统一提示两类编号各自有哪些不存在 ======
+ if (!missingMaterials.isEmpty() || !missingCustomers.isEmpty()) {
+ List problems = new ArrayList<>();
+ if (!missingMaterials.isEmpty()) {
+ problems.add("物料[" + String.join("、", missingMaterials) + "]不存在，请先维护物料信息");
+ }
+ if (!missingCustomers.isEmpty()) {
+ problems.add("客户[" + String.join("、", missingCustomers) + "]不存在，请先维护客户信息");
+ }
+ throw new ServiceException(String.join("；", problems) + "，维护完成后重新导入");
+ }
+ // ====== 后续处理（编号均已存在）：名称自动匹配、货主归属与一致性校验、建单 ======
+ // 明细回填库中匹配到的物料名称（自动匹配，模板中的名称列可不填/以库中为准；库中名称为空时保留模板值）
+ for (StockInProductDetail productDetail : productDetailList) {
+ String materialName = materialCache.get(productDetail.getProductCode()).getMaterialName();
+ if (materialName != null && !materialName.trim().isEmpty()) {
+ productDetail.setProductName(materialName);
+ }
+ }
+ // 物料归属货主集合（用于客户编号一致性校验，及未填客户编号时的兜底取值）
List> shipperIds = new ArrayList<>();
Set processedShipperIds = new HashSet<>();
- for (StockInProductDetail productDetail : productDetailList) {
- MaterialBaseInfoPO materialBaseInfoPO = stockInOrderMapper.getByCode(productDetail.getProductCode(),loginUser.getUserPo().getOrganizationId());
- // 物料在当前登录组织下不存在时给出明确提示，避免后续货主取值越界导致500
- if (materialBaseInfoPO == null) {
- throw new ServiceException("产品编号[" + productDetail.getProductCode() + "]在当前组织下不存在，请核对产品编号或使用物料所属组织的账号导入");
- }
- if (materialBaseInfoPO.getShipperId() != null) {
- Long shipperId = materialBaseInfoPO.getShipperId();
- if (processedShipperIds.add(shipperId)) {
- Map shipper = new HashMap<>();
- shipper.put("shipperId", shipperId);
- shipper.put("shipperName", materialBaseInfoPO.getShipperName());
- shipper.put("shipperCode", materialBaseInfoPO.getShipperCode());
- shipperIds.add(shipper);
- }
+ for (MaterialBaseInfoPO materialBaseInfoPO : materialCache.values()) {
+ if (materialBaseInfoPO.getShipperId() != null && processedShipperIds.add(materialBaseInfoPO.getShipperId())) {
+ Map shipper = new HashMap<>();
+ shipper.put("shipperId", materialBaseInfoPO.getShipperId());
+ shipper.put("shipperName", materialBaseInfoPO.getShipperName());
+ shipper.put("shipperCode", materialBaseInfoPO.getShipperCode());
+ shipperIds.add(shipper);
}
}
- if (shipperIds.isEmpty()) {
- throw new ServiceException("导入的产品均未配置货主，请先在物料档案中维护货主信息");
+ if (shipperIds.size() > 1) {
+ StringBuilder shipperCodeStr = new StringBuilder();
+ for (Map shipper : shipperIds) {
+ if (shipperCodeStr.length() > 0) {
+ shipperCodeStr.append("、");
+ }
+ shipperCodeStr.append(shipper.get("shipperCode"));
+ }
+ throw new ServiceException("导入的物料不属于同一货主（货主编号：" + shipperCodeStr + "），一个入库单只能属于一个货主");
+ }
+ // 客户取值：模板填了客户编号时取库中匹配结果（编号/名称均为自动匹配值）
+ UserPo customer = null;
+ if (customerCodes.size() > 1) {
+ throw new ServiceException("导入明细中存在多个客户编号（" + String.join("、", customerCodes) + "），一个入库单只能属于一个客户");
+ }
+ if (!customerCodes.isEmpty()) {
+ String customerCode = customerCodes.iterator().next();
+ customer = customerCache.get(customerCode);
+ // 客户编号与物料归属货主一致性校验（不一致拦截，提示两者编号；货主编码未维护时提示货主名称）
+ if (!shipperIds.isEmpty() && !customer.getUserId().equals(shipperIds.get(0).get("shipperId"))) {
+ Object materialShipperCode = shipperIds.get(0).get("shipperCode");
+ String materialShipperDisplay = (materialShipperCode != null && !materialShipperCode.toString().trim().isEmpty())
+ ? "货主编号[" + materialShipperCode + "]" : "货主[" + shipperIds.get(0).get("shipperName") + "]";
+ throw new ServiceException("客户编号[" + customerCode + "]与物料归属" + materialShipperDisplay + "]不一致，请核对后再导入");
+ }
+ stockInHeader.setCustomerCode(customerCode);
+ stockInHeader.setCustomerName(customer.getUserName());
}
ReservationStockInOrderDO reservationStockInOrderDO = new ReservationStockInOrderDO();
- StockInHeader stockInHeader = resultDTO.getStockInHeader();
// 业务单号：优先使用模板自带OrderNO（不做格式规则校验），与系统已有业务单号重复时提示不允许导入；
// 入库业务单号(in_order_number)不使用模板单号，统一由系统原本逻辑生成（见insertDomain）；
// 模板未填单号时保持系统逻辑：业务单号默认=入库业务单号
@@ -515,9 +641,19 @@ public class ReservationStockInOrderImpl extends ServiceImpl queryOutStockNoticePrintDetail(ReservationStockOutOrderDO stockOutOrderDO);
- Long queryShipperId(@Param("userMemberCode") String userMemberCode,@Param("organizationId") Long organizationId);
+ /**
+ * 按客户编号+组织查询客户（用户表），返回客户ID/编号/名称
+ * 客户编号兼容两种编码：USER.USER_MEMBER_CODE（客户编码）或 USER_SHIPPER.CUSTOMER_NC_CODE（NC客户代码/khdm），任一命中即可
+ * 用于出入库导入时校验客户是否存在并自动匹配客户名称；结果为空表示库中无该客户
+ */
+ UserPo queryCustomerByCode(@Param("userMemberCode") String userMemberCode, @Param("organizationId") Long organizationId);
int countByOrderNumberPrefix(@Param("prefix") String prefix);
diff --git a/mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/inboundRank/ExecutionInboundRankApi.java b/mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/inboundRank/ExecutionInboundRankApi.java
new file mode 100644
index 000000000..f97d23e57
--- /dev/null
+++ b/mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/inboundRank/ExecutionInboundRankApi.java
@@ -0,0 +1,110 @@
+package com.mhd.oms.interfaces.facade.inboundRank;
+
+import com.github.pagehelper.PageInfo;
+import com.mhd.common.core.constant.HttpStatus;
+import com.mhd.common.core.utils.PageUtils;
+import com.mhd.common.core.utils.poi.ExcelUtil;
+import com.mhd.oms.domain.inboundRank.repository.po.ExecutionInboundMaterialRankPO;
+import com.mhd.oms.domain.inboundRank.repository.po.ExecutionInboundRankTotalPO;
+import com.mhd.oms.domain.inboundRank.repository.todo.ExecutionInboundRankDO;
+import com.mhd.oms.domain.inboundRank.repository.todo.ExecutionInboundRankDTO;
+import com.mhd.oms.domain.inboundRank.service.ExecutionInboundRankApplicationService;
+import com.mhd.oms.domain.inboundRank.service.ExecutionInboundRankAssembler;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import java.net.URLEncoder;
+import java.util.HashMap;
+import java.util.List;
+
+/**
+ * 入库排名统计Api
+ *
+ * 按入仓日期区间筛选商品入库量统计排名。OMS 库执行入库单状态/上架数量均不回传，真实数据在 WMS 库，
+ * 故数据源跨库取 WMS 入库表(NGWL_TEST_WMS.stock_in_order/in_material_detail，与 OMS 出库排名跨库修法一致)；
+ * 口径与 WMS 端 /inboundRankApi 完全一致，两边数字一致：仅已入库(5) + 明细 level=1 主行 +
+ * 入仓日期(为空的历史单按建档时间兜底) + 件数=实际上架量(SHELVES_QUANTITY)；
+ * 一行 = 某仓单内某货品的合计，按件数降序排名。
+ * 字段：入仓日期/仓单编号/客户编号/存货人/货名/件数/毛重(吨)/投保总额/体积(CBM)。
+ * 与出库排名(/executionOutboundRankApi)配对，前端用 tab 页区分
+ *
+ * @author rcx
+ * @date 2026-08-31
+ */
+@RestController
+@RequestMapping("/executionInboundRankApi")
+@Slf4j
+public class ExecutionInboundRankApi {
+
+ @Resource
+ private ExecutionInboundRankAssembler executionInboundRankAssembler;
+
+ @Autowired
+ private ExecutionInboundRankApplicationService executionInboundRankApplicationService;
+
+ /**
+ * 分页查询商品入库排名列表（含合计行）
+ */
+ @ApiOperation("分页查询商品入库排名列表")
+ @GetMapping("/queryMaterialRankList")
+ public HashMap queryMaterialRankList(ExecutionInboundRankDTO executionInboundRankDTO) {
+ //转换实体
+ ExecutionInboundRankDO executionInboundRankDO = executionInboundRankAssembler.toDO(executionInboundRankDTO);
+ startPage();
+ List list = executionInboundRankApplicationService.queryMaterialRankList(executionInboundRankDO);
+ ExecutionInboundRankTotalPO total = executionInboundRankApplicationService.queryMaterialRankTotal(executionInboundRankDO);
+ return getDataTableWithTotal(list, total);
+ }
+
+ /**
+ * 导出商品入库排名Excel
+ */
+ @ApiOperation("导出商品入库排名Excel")
+ @GetMapping("/exportMaterialRank")
+ public void exportMaterialRank(HttpServletResponse response, ExecutionInboundRankDTO executionInboundRankDTO) throws Exception {
+ //转换实体（不分页，导出全量）
+ ExecutionInboundRankDO executionInboundRankDO = executionInboundRankAssembler.toDO(executionInboundRankDTO);
+ List list = executionInboundRankApplicationService.exportMaterialRank(executionInboundRankDO);
+
+ String fileName = URLEncoder.encode("入库排名统计", "UTF-8").replaceAll("\\+", "%20");
+ response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
+ response.setCharacterEncoding("utf-8");
+ response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx");
+
+ ExcelUtil util = new ExcelUtil<>(ExecutionInboundMaterialRankPO.class);
+ util.exportExcel(response, list, "入库排名统计");
+ }
+
+ /**
+ * 分页结果 + 合计行：data/total/code/msg 之外追加
+ * totalPieceCount/totalGrossWeightTon/totalInsureAmount/totalVolume/totalOrderCount
+ */
+ private HashMap getDataTableWithTotal(List list, ExecutionInboundRankTotalPO total) {
+ HashMap result = new HashMap<>();
+ result.put("data", list);
+ result.put("total", new PageInfo<>(list).getTotal());
+ result.put("code", HttpStatus.SUCCESS);
+ result.put("msg", "查询成功");
+ if (total != null) {
+ result.put("totalPieceCount", total.getTotalPieceCount());
+ result.put("totalGrossWeightTon", total.getTotalGrossWeightTon());
+ result.put("totalInsureAmount", total.getTotalInsureAmount());
+ result.put("totalVolume", total.getTotalVolume());
+ result.put("totalOrderCount", total.getTotalOrderCount());
+ }
+ return result;
+ }
+
+ /**
+ * 设置请求分页数据
+ */
+ protected void startPage() {
+ PageUtils.startPage();
+ }
+}
diff --git a/mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/outboundRank/ExecutionOutboundRankApi.java b/mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/outboundRank/ExecutionOutboundRankApi.java
new file mode 100644
index 000000000..f1222e413
--- /dev/null
+++ b/mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/outboundRank/ExecutionOutboundRankApi.java
@@ -0,0 +1,139 @@
+package com.mhd.oms.interfaces.facade.outboundRank;
+
+import com.github.pagehelper.PageInfo;
+import com.mhd.common.core.constant.HttpStatus;
+import com.mhd.common.core.utils.PageUtils;
+import com.mhd.common.core.utils.poi.ExcelUtil;
+import com.mhd.oms.domain.outboundRank.repository.po.ExecutionOutboundLineRankPO;
+import com.mhd.oms.domain.outboundRank.repository.po.ExecutionOutboundMaterialRankPO;
+import com.mhd.oms.domain.outboundRank.repository.po.ExecutionOutboundRankTotalPO;
+import com.mhd.oms.domain.outboundRank.repository.todo.ExecutionOutboundRankDO;
+import com.mhd.oms.domain.outboundRank.repository.todo.ExecutionOutboundRankDTO;
+import com.mhd.oms.domain.outboundRank.service.ExecutionOutboundRankApplicationService;
+import com.mhd.oms.domain.outboundRank.service.ExecutionOutboundRankAssembler;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import java.net.URLEncoder;
+import java.util.HashMap;
+import java.util.List;
+
+/**
+ * 出库排名统计Api
+ *
+ * 按日期区间筛选，统计商品/线路出库量排名。OMS 库出库单状态不流转（无"已出库"数据），
+ * 数据源跨库取 WMS 库出库表（NGWL_TEST_WMS.stock_out_order / out_material_detail），
+ * 口径与 WMS 端 /outboundRankApi 完全一致，两边数字一致；
+ * 统计条件：出库单创建时间 + 已出库及之后状态(9,12,13)，明细仅取 level=1 主行；
+ * 销售量=SUM(出库数量)、交易数=COUNT(DISTINCT 出库单号)、金额=SUM(明细总价)
+ *
+ * @author rcx
+ * @date 2026-08-31
+ */
+@RestController
+@RequestMapping("/executionOutboundRankApi")
+@Slf4j
+public class ExecutionOutboundRankApi {
+
+ @Resource
+ private ExecutionOutboundRankAssembler executionOutboundRankAssembler;
+
+ @Autowired
+ private ExecutionOutboundRankApplicationService executionOutboundRankApplicationService;
+
+ /**
+ * 分页查询商品出库排名列表（含合计行）
+ */
+ @ApiOperation("分页查询商品出库排名列表")
+ @GetMapping("/queryMaterialRankList")
+ public HashMap queryMaterialRankList(ExecutionOutboundRankDTO executionOutboundRankDTO) {
+ //转换实体
+ ExecutionOutboundRankDO executionOutboundRankDO = executionOutboundRankAssembler.toDO(executionOutboundRankDTO);
+ startPage();
+ List list = executionOutboundRankApplicationService.queryMaterialRankList(executionOutboundRankDO);
+ ExecutionOutboundRankTotalPO total = executionOutboundRankApplicationService.queryMaterialRankTotal(executionOutboundRankDO);
+ return getDataTableWithTotal(list, total);
+ }
+
+ /**
+ * 分页查询线路出库排名列表（含合计行）
+ */
+ @ApiOperation("分页查询线路出库排名列表")
+ @GetMapping("/queryLineRankList")
+ public HashMap queryLineRankList(ExecutionOutboundRankDTO executionOutboundRankDTO) {
+ //转换实体
+ ExecutionOutboundRankDO executionOutboundRankDO = executionOutboundRankAssembler.toDO(executionOutboundRankDTO);
+ startPage();
+ List list = executionOutboundRankApplicationService.queryLineRankList(executionOutboundRankDO);
+ ExecutionOutboundRankTotalPO total = executionOutboundRankApplicationService.queryLineRankTotal(executionOutboundRankDO);
+ return getDataTableWithTotal(list, total);
+ }
+
+ /**
+ * 导出商品出库排名Excel
+ */
+ @ApiOperation("导出商品出库排名Excel")
+ @GetMapping("/exportMaterialRank")
+ public void exportMaterialRank(HttpServletResponse response, ExecutionOutboundRankDTO executionOutboundRankDTO) throws Exception {
+ //转换实体（不分页，导出全量）
+ ExecutionOutboundRankDO executionOutboundRankDO = executionOutboundRankAssembler.toDO(executionOutboundRankDTO);
+ List list = executionOutboundRankApplicationService.exportMaterialRankList(executionOutboundRankDO);
+
+ String fileName = URLEncoder.encode("商品出库排名", "UTF-8").replaceAll("\\+", "%20");
+ response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
+ response.setCharacterEncoding("utf-8");
+ response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx");
+
+ ExcelUtil util = new ExcelUtil<>(ExecutionOutboundMaterialRankPO.class);
+ util.exportExcel(response, list, "商品出库排名");
+ }
+
+ /**
+ * 导出线路出库排名Excel
+ */
+ @ApiOperation("导出线路出库排名Excel")
+ @GetMapping("/exportLineRank")
+ public void exportLineRank(HttpServletResponse response, ExecutionOutboundRankDTO executionOutboundRankDTO) throws Exception {
+ //转换实体（不分页，导出全量）
+ ExecutionOutboundRankDO executionOutboundRankDO = executionOutboundRankAssembler.toDO(executionOutboundRankDTO);
+ List list = executionOutboundRankApplicationService.exportLineRankList(executionOutboundRankDO);
+
+ String fileName = URLEncoder.encode("线路出库排名", "UTF-8").replaceAll("\\+", "%20");
+ response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
+ response.setCharacterEncoding("utf-8");
+ response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx");
+
+ ExcelUtil util = new ExcelUtil<>(ExecutionOutboundLineRankPO.class);
+ util.exportExcel(response, list, "线路出库排名");
+ }
+
+ /**
+ * 分页结果 + 合计行：data/total/code/msg 之外追加 totalSalesQuantity/totalTradeCount/totalAmount
+ */
+ private HashMap getDataTableWithTotal(List list, ExecutionOutboundRankTotalPO total) {
+ HashMap result = new HashMap<>();
+ result.put("data", list);
+ result.put("total", new PageInfo<>(list).getTotal());
+ result.put("code", HttpStatus.SUCCESS);
+ result.put("msg", "查询成功");
+ if (total != null) {
+ result.put("totalSalesQuantity", total.getTotalSalesQuantity());
+ result.put("totalTradeCount", total.getTotalTradeCount());
+ result.put("totalAmount", total.getTotalAmount());
+ }
+ return result;
+ }
+
+ /**
+ * 设置请求分页数据
+ */
+ protected void startPage() {
+ PageUtils.startPage();
+ }
+}
diff --git a/mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/reservationMaterialInventory/ReservationMaterialInventoryApi.java b/mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/reservationMaterialInventory/ReservationMaterialInventoryApi.java
index 7d1368cf8..0fcb31b52 100644
--- a/mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/reservationMaterialInventory/ReservationMaterialInventoryApi.java
+++ b/mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/reservationMaterialInventory/ReservationMaterialInventoryApi.java
@@ -47,13 +47,18 @@ public class ReservationMaterialInventoryApi extends BaseController {
/**
* 分页查询物料库存列表
*/
- @ApiOperation("查询物料库存列表")
+ @ApiOperation(value = "查询物料库存列表", notes = "导出复用本接口：传 isExport=true 标识导出请求(导出显示：商品饮用有效期expiryDate/物料分类materialClassifyName/进货日期purchaseDate，所有查询维度均返回)；excludeZeroInventoryQuantity=true 排除库存为0的数据(所有维度生效)；orderByExpiryDate=true 按到期日分组排序")
@GetMapping("/list")
public TableDataInfo list(ReservationMaterialInventoryDTO materialInventoryDTO,
@RequestParam(value = "customerName", required = false) String customerName,
@RequestParam(value = "expiryDateStart", required = false) String expiryDateStart,
@RequestParam(value = "expiryDateEnd", required = false) String expiryDateEnd,
- @RequestParam(value = "orderByExpiryDate", required = false) Boolean orderByExpiryDate)
+ @RequestParam(value = "purchaseDateStart", required = false) String purchaseDateStart,
+ @RequestParam(value = "purchaseDateEnd", required = false) String purchaseDateEnd,
+ @RequestParam(value = "excludeZeroInventoryQuantity", required = false) Boolean excludeZeroInventoryQuantity,
+ @RequestParam(value = "orderByExpiryDate", required = false) Boolean orderByExpiryDate,
+ // 导出标识：导出与查询共用本接口，isExport=true 表示本次请求为导出（导出专属排序等逻辑以此开关）
+ @RequestParam(value = "isExport", required = false) Boolean isExport)
{
// 出库分配前端传的是客户名称 customerName，这里通过名称查询货主ID，使用精确匹配（不模糊匹配）
String shipperName = null; // 保存查询到的货主名称
@@ -81,17 +86,25 @@ public class ReservationMaterialInventoryApi extends BaseController {
ReservationMaterialInventoryDO materialInventoryDO = materialInventoryAssembler.toDO(materialInventoryDTO);
materialInventoryDO.setExpiryDateStr(materialInventoryDTO.getExpiryDate());
materialInventoryDO.setProductionDateStr(materialInventoryDTO.getProductionDate());
+ materialInventoryDO.setPurchaseDateStr(materialInventoryDTO.getPurchaseDate());
materialInventoryDO.setExpiryDateStart(expiryDateStart);
materialInventoryDO.setExpiryDateEnd(expiryDateEnd);
+ materialInventoryDO.setPurchaseDateStart(purchaseDateStart);
+ materialInventoryDO.setPurchaseDateEnd(purchaseDateEnd);
// 导出场景：queryRule=wlExpiry + orderByExpiryDate=true 时 SQL 按到期日倒序分组
// （日期近的在前、空值最后、0库存靠后、同到期日按更新时间倒序）
materialInventoryDO.setOrderByExpiryDate(orderByExpiryDate);
+ // 导出场景：前端"库存为0是否导出"选"是"时传 excludeZeroInventoryQuantity=true，
+ // SQL 用 HAVING 排除汇总库存为0的数据（与 WMS 同名参数语义一致）
+ materialInventoryDO.setExcludeZeroInventoryQuantity(excludeZeroInventoryQuantity);
+ // 导出标识：isExport=true 启用导出融合排序（到期日倒序优先 → 同到期日按物料编码升序，所有维度生效）
+ materialInventoryDO.setIsExport(isExport);
startPage();
// 使用带批次属性的查询方法，批次属性值从库存表中获取
List list = materialInventoryApplicationService.queryListWithBatchAttributes(materialInventoryDO);
// 按更新时间倒序排序；update_time 为空的数据放最后
- // （导出 orderByExpiryDate=true 时跳过该重排，避免覆盖 SQL 的到期日分组排序）
- if (!Boolean.TRUE.equals(orderByExpiryDate)) {
+ // （导出 orderByExpiryDate=true 或 isExport=true 时跳过该重排，避免覆盖 SQL 的导出排序）
+ if (!Boolean.TRUE.equals(orderByExpiryDate) && !Boolean.TRUE.equals(isExport)) {
list.sort((o1, o2) -> {
Date t1 = o1.getUpdateTime();
Date t2 = o2.getUpdateTime();
@@ -168,6 +181,20 @@ public class ReservationMaterialInventoryApi extends BaseController {
return AjaxResult.success(materialInventoryApplicationService.getInventoryByStorageLocationIdAndMaterialBaseInfoId(storageLocationId, materialBaseInfoId));
}
+ /**
+ * 入库业务单新增页面：根据物料编号查询其库存批次过期日期+批次号，去重取最近5条，
+ * 供前端下拉回显；用户也可点击右侧"日期"小图标手动选择日期
+ */
+ @ApiOperation("根据物料编号查询库存批次最近5条过期日期+批次号")
+ @GetMapping(value = "/queryRecentExpiryDates/{materialCode}")
+ public AjaxResult queryRecentExpiryDates(@PathVariable("materialCode") String materialCode)
+ {
+ if (StringUtils.isBlank(materialCode)) {
+ return AjaxResult.error("物料编号不能为空");
+ }
+ return AjaxResult.success(materialInventoryApplicationService.selectRecentExpiryBatches(materialCode));
+ }
+
/**
diff --git a/mhd_oms/src/main/resources/bootstrap.yml b/mhd_oms/src/main/resources/bootstrap.yml
index ee058f0f6..88471e390 100644
--- a/mhd_oms/src/main/resources/bootstrap.yml
+++ b/mhd_oms/src/main/resources/bootstrap.yml
@@ -18,15 +18,15 @@ spring:
discovery:
# server-addr: 127.0.0.1:8848
# 线上测试环境配置 容器名+端口号
-# server-addr: 10.33.0.129:6010
- server-addr: 10.102.192.30:6848
+ server-addr: 10.33.0.129:6010
+# server-addr: 10.102.192.30:6848
username: nacos
password: manhuoda@2023
config:
# server-addr: 127.0.0.1:8848
# 线上测试环境配置 容器名+端口号
-# server-addr: 10.33.0.129:6010
- server-addr: 10.102.192.30:6848
+ server-addr: 10.33.0.129:6010
+# server-addr: 10.102.192.30:6848
username: nacos
password: manhuoda@2023
#线上正式环境
diff --git a/mhd_oms/src/main/resources/mapper/inboundRank/ExecutionInboundRankMapper.xml b/mhd_oms/src/main/resources/mapper/inboundRank/ExecutionInboundRankMapper.xml
new file mode 100644
index 000000000..e6b76eb0d
--- /dev/null
+++ b/mhd_oms/src/main/resources/mapper/inboundRank/ExecutionInboundRankMapper.xml
@@ -0,0 +1,107 @@
+
+
+
+
+
+
+ a.del_flag = 1
+ and a.level = 1
+ and b.status = 5
+
+ and b.top_organization_id = #{topOrganizationId}
+
+
+ and b.warehouse_name like concat('%', #{warehouseName}, '%')
+
+
+ and b.in_order_number like concat('%', #{inOrderNumber}, '%')
+
+
+ and b.shipper_code like concat('%', #{shipperCode}, '%')
+
+
+ and b.shipper_name like concat('%', #{shipperName}, '%')
+
+
+ and a.material_code like concat('%', #{materialCode}, '%')
+
+
+ and a.material_name like concat('%', #{materialName}, '%')
+
+
+ and date_format(IFNULL(b.warehouse_date, b.create_time),'%Y-%m-%d') >= #{warehouseDateStart}
+
+
+ and date_format(IFNULL(b.warehouse_date, b.create_time),'%Y-%m-%d') <= #{warehouseDateEnd}
+
+
+
+
+ from NGWL_TEST_WMS.in_material_detail a
+ join NGWL_TEST_WMS.stock_in_order b on a.in_order_number = b.in_order_number and b.del_flag = 1
+ left join NGWL_TEST_WMS.material_base_info c on a.material_base_info_id = c.material_base_info_id
+
+
+
+
+
+
+
+
diff --git a/mhd_oms/src/main/resources/mapper/outboundRank/ExecutionOutboundRankMapper.xml b/mhd_oms/src/main/resources/mapper/outboundRank/ExecutionOutboundRankMapper.xml
new file mode 100644
index 000000000..f35689979
--- /dev/null
+++ b/mhd_oms/src/main/resources/mapper/outboundRank/ExecutionOutboundRankMapper.xml
@@ -0,0 +1,121 @@
+
+
+
+
+
+
+ a.del_flag = 1
+ and a.level = 1
+ and b.status in (9, 12, 13)
+
+ and b.top_organization_id = #{topOrganizationId}
+
+
+ and b.warehouse_name like concat('%', #{warehouseName}, '%')
+
+
+ and b.customer_name like concat('%', #{customerName}, '%')
+
+
+ and b.shipper_name like concat('%', #{shipperName}, '%')
+
+
+ and b.line_code like concat('%', #{lineCode}, '%')
+
+
+ and b.line_name like concat('%', #{lineName}, '%')
+
+
+ and a.material_code like concat('%', #{materialCode}, '%')
+
+
+ and a.material_name like concat('%', #{materialName}, '%')
+
+
+ and date_format(b.create_time,'%Y-%m-%d') >= #{createTimeStart}
+
+
+ and date_format(b.create_time,'%Y-%m-%d') <= #{createTimeEnd}
+
+
+
+
+ from NGWL_TEST_WMS.out_material_detail a
+ join NGWL_TEST_WMS.stock_out_order b on a.out_order_number = b.out_order_number and b.del_flag = 1
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/mhd_oms/src/main/resources/mapper/reservationMaterialInventory/MaterialInventoryMapper.xml b/mhd_oms/src/main/resources/mapper/reservationMaterialInventory/MaterialInventoryMapper.xml
index 0297f8a29..e9cd17b19 100644
--- a/mhd_oms/src/main/resources/mapper/reservationMaterialInventory/MaterialInventoryMapper.xml
+++ b/mhd_oms/src/main/resources/mapper/reservationMaterialInventory/MaterialInventoryMapper.xml
@@ -56,6 +56,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+
@@ -64,6 +65,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+
+
@@ -138,7 +143,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
IFNULL (sum(a.GROSS_WEIGHT), 0) GROSS_WEIGHT,
IFNULL (sum(a.VOLUME), 0) VOLUME,
a.ext_attr_1, a.ext_attr_2, a.ext_attr_3, a.ext_attr_4,
- a.production_date, a.expiry_date, a.inventory_date,
+ a.production_date, a.expiry_date, a.inventory_date, a.purchase_date,
a.BATCH_REF_NO, a.SHEET_REF_NO, a.BOX_PALLET_NO,nvl(a.unit_name,b.unit_name) as unit_name,
a.bar_code as inv_bar_code,
a.in_order_number,a.lot_number
@@ -280,6 +285,35 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and a.expiry_date DATEADD(DAY, 1, #{expiryDateEnd})
+
+ AND TO_CHAR(a.purchase_date, 'yyyy-MM-dd') = #{purchaseDateStr}
+
+
+ and a.purchase_date >= #{purchaseDateStart}
+
+
+ and a.purchase_date DATEADD(DAY, 1, #{purchaseDateEnd})
+
+
+
+
+
+
+ HAVING IFNULL(SUM(a.inventory_quantity), 0) > 0
+
+
+
+
+
+ order by CASE WHEN MAX(a.expiry_date) IS NULL THEN 1 ELSE 0 END ASC, MAX(a.expiry_date) DESC,
+ MAX(b.material_code) ASC,
+ CASE WHEN IFNULL(SUM(a.inventory_quantity), 0) = 0 THEN 1 ELSE 0 END ASC,
+ MAX(a.update_time) DESC,
+ MAX(a.material_inventory_id) DESC
@@ -353,12 +405,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
IFNULL(SUM(a.VOLUME), 0) AS VOLUME,
MAX(a.unit) AS unit,
MAX(a.unit_name) AS unit_name,
+ MAX(a.create_time) AS create_time,
+ MAX(a.update_time) AS update_time,
MAX(a.production_date) AS production_date,
MAX(a.inventory_date) AS inventory_date,
+ MAX(a.purchase_date) AS purchase_date,
MAX(a.batch_ref_no) AS batch_ref_no, MAX(a.sheet_ref_no) AS sheet_ref_no, MAX(a.box_pallet_no) AS box_pallet_no,
MAX(a.bar_code) AS inv_bar_code,
MAX(a.in_order_number) AS in_order_number, MAX(a.lot_number) AS lot_number,
b.material_code, b.material_name,
+ MAX(b.material_classify_code) AS material_classify_code,
+ MAX(b.material_classify_name) AS material_classify_name,
CASE WHEN IFNULL(SUM(a.inventory_quantity), 0) = 0 THEN 1 ELSE 0 END AS sort_order
from reservation_material_inventory a
left join NGWL_TEST_WMS.material_base_info b on a.material_base_info_id = b.material_base_info_id
@@ -369,16 +426,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
GROUP BY a.MATERIAL_BASE_INFO_ID, a.EXPIRY_DATE, a.shipper_id, a.shipper_code, a.shipper_name,
a.organization_id, a.organization_name, a.top_organization_id,
b.material_code, b.material_name
-
+
+
-
- order by CASE WHEN a.expiry_date IS NULL THEN 1 ELSE 0 END ASC, a.expiry_date DESC,
- sort_order, MAX(a.update_time) DESC
+
+
- order by sort_order, MAX(a.update_time) desc
+
+
+
+ order by CASE WHEN a.expiry_date IS NULL THEN 1 ELSE 0 END ASC, a.expiry_date DESC,
+ sort_order, MAX(a.update_time) DESC
+
+
+ order by sort_order, MAX(a.update_time) desc
+
+
@@ -394,6 +461,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
GROUP BY a.SHIPPER_ID
+
+
+
+
@@ -447,6 +518,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+
@@ -527,4 +599,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
FROM NGWL_TEST_WMS.material_bar_code
WHERE material_base_info_id = #{id} AND del_flag = 1
+
+
+
\ No newline at end of file
diff --git a/mhd_oms/src/main/resources/mapper/reservationStockOutOrder/ReservationStockOutOrderMapper.xml b/mhd_oms/src/main/resources/mapper/reservationStockOutOrder/ReservationStockOutOrderMapper.xml
index 68fd934af..a83d8f6e9 100644
--- a/mhd_oms/src/main/resources/mapper/reservationStockOutOrder/ReservationStockOutOrderMapper.xml
+++ b/mhd_oms/src/main/resources/mapper/reservationStockOutOrder/ReservationStockOutOrderMapper.xml
@@ -470,8 +470,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-
@@ -614,6 +702,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
a.top_organization_id,
MAX(b.material_type) AS material_type,
MAX(b.material_type_name) AS material_type_name,
+ MAX(b.material_classify_code) AS material_classify_code,
+ MAX(b.material_classify_name) AS material_classify_name,
MAX(b.bar_code) AS bar_code,
MAX(nvl(a.unit_name, b.unit_name)) AS unit_name,
MAX(b.pack_id) AS pack_id,
@@ -651,7 +741,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
b.material_code,
a.warehouse_id,
a.organization_id, a.top_organization_id
- ORDER BY sort_order, MAX(a.update_time) DESC
+
+
+
+
+ ORDER BY sort_order, MAX(a.update_time) DESC
+
@@ -728,6 +829,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+
+
@@ -1195,6 +1300,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+
@@ -1513,6 +1619,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
AND TRUNC(a.PRODUCTION_DATE) = TRUNC(#{productionDate})
+
+ AND TRUNC(a.purchase_date) = TRUNC(#{purchaseDate})
+
AND a.EXT_ATTR_2 = #{extAttr2}
@@ -1544,6 +1653,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
AND a.PRODUCTION_DATE is null
+
+ AND a.purchase_date is null
+
AND a.EXT_ATTR_2 = #{extAttr2}
diff --git a/mhd_wms/src/main/resources/mapper/outboundRank/OutboundRankMapper.xml b/mhd_wms/src/main/resources/mapper/outboundRank/OutboundRankMapper.xml
new file mode 100644
index 000000000..54aa7458b
--- /dev/null
+++ b/mhd_wms/src/main/resources/mapper/outboundRank/OutboundRankMapper.xml
@@ -0,0 +1,126 @@
+
+
+
+
+
+
+ a.del_flag = 1
+ and a.level = 1
+ and b.status in (9, 12, 13)
+
+ and b.top_organization_id = #{topOrganizationId}
+
+
+ and b.warehouse_id = #{warehouseId}
+
+
+ and b.warehouse_name like concat('%', #{warehouseName}, '%')
+
+
+ and b.customer_name like concat('%', #{customerName}, '%')
+
+
+ and b.shipper_name like concat('%', #{shipperName}, '%')
+
+
+ and b.line_code like concat('%', #{lineCode}, '%')
+
+
+ and b.line_name like concat('%', #{lineName}, '%')
+
+
+ and date_format(b.create_time,'%Y-%m-%d') >= #{createTimeStart}
+
+
+ and date_format(b.create_time,'%Y-%m-%d') <= #{createTimeEnd}
+
+
+
+
+ from out_material_detail a
+ join stock_out_order b on a.out_order_number = b.out_order_number and b.del_flag = 1
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/sql/20260831_wms_oms_add_purchase_date.sql b/sql/20260831_wms_oms_add_purchase_date.sql
new file mode 100644
index 000000000..a521b45c7
--- /dev/null
+++ b/sql/20260831_wms_oms_add_purchase_date.sql
@@ -0,0 +1,68 @@
+-- =============================================================================
+-- OMS/WMS 库存查询新增「进货日期」查询条件 —— 新增 PURCHASE_DATE 列
+-- 日期: 2026-08-31
+-- 数据库: 达梦(DM8), 兼容 Oracle 语法, 表名/字段名统一大写
+-- 模式: NGWL_TEST_WMS (mhd_wms) / NGWL_TEST_OMS (mhd_oms)
+-- 需求:
+-- OMS-库存管理-库存查询 / WMS-库存管理-库存查询 增加查询条件:
+-- 物料分类(后端已支持, 无需改表)、进货日期(本脚本, 新字段)、入库日期(复用
+-- create_time, 无需改表)。
+-- 说明:
+-- 1. 进货日期录入入口为「收货批次属性」(batch_detail 配置标签「进货日期」),
+-- 链路: 收货明细 -> 上架明细 -> WMS 物料库存 -> Feign -> OMS 预留库存。
+-- 2. 列追加在表尾(DM 不支持 AFTER 定位); 历史数据该列为空, 按进货日期查询
+-- 查不到存量库存(无来源可回填)。
+-- 3. DATE 类型与同表现有 PRODUCTION_DATE/EXPIRY_DATE/INVENTORY_DATE 保持一致。
+-- =============================================================================
+
+-- WMS 收货明细
+ALTER TABLE "NGWL_TEST_WMS"."RECEIPT_MATERIAL_DETAIL" ADD COLUMN PURCHASE_DATE DATE;
+COMMENT ON COLUMN "NGWL_TEST_WMS"."RECEIPT_MATERIAL_DETAIL".PURCHASE_DATE IS '进货日期';
+
+-- WMS 上架明细
+ALTER TABLE "NGWL_TEST_WMS"."SHELF_MATERIAL_DETAIL" ADD COLUMN PURCHASE_DATE DATE;
+COMMENT ON COLUMN "NGWL_TEST_WMS"."SHELF_MATERIAL_DETAIL".PURCHASE_DATE IS '进货日期';
+
+-- WMS 物料库存
+ALTER TABLE "NGWL_TEST_WMS"."MATERIAL_INVENTORY" ADD COLUMN PURCHASE_DATE DATE;
+COMMENT ON COLUMN "NGWL_TEST_WMS"."MATERIAL_INVENTORY".PURCHASE_DATE IS '进货日期';
+
+-- OMS 预留库存
+ALTER TABLE "NGWL_TEST_OMS"."RESERVATION_MATERIAL_INVENTORY" ADD COLUMN PURCHASE_DATE DATE;
+COMMENT ON COLUMN "NGWL_TEST_OMS"."RESERVATION_MATERIAL_INVENTORY".PURCHASE_DATE IS '进货日期';
+
+-- =============================================================================
+-- 批次明细配置(可选, 数据操作): 需要按进货日期录入/分行的物料, 在其批次规则中
+-- 新增一条明细。BATCH_LABELS 必须一字不差为「进货日期」(后端 setMore() 按标签
+-- 精确匹配解析); IS_DISPLAY=1 时同时参与库存行合并键(不同进货日期分库存行)。
+--
+-- 参考现有「生产日期」配置行(格式/控件取值对齐):
+-- SELECT * FROM "NGWL_TEST_SYSTEM"."BATCH_DETAIL" WHERE BATCH_LABELS = '生产日期';
+--
+-- 配置模板(BATCH_ID 等按实际批次规则替换, 建议直接在 系统-批次管理 界面新增):
+-- INSERT INTO "NGWL_TEST_SYSTEM"."BATCH_DETAIL"
+-- (BATCH_DETAIL_ID, ORGANIZATION_ID, TOP_ORGANIZATION_ID, BATCH_ID,
+-- BATCH_LABELS, FIELD_NAME, INPUT_CONTROL, ATTRIBUTE_FORMAT, IS_DISPLAY)
+-- VALUES
+-- (<主键>, <组织ID>, <顶级组织ID>, <批次规则ID>,
+-- '进货日期', 'purchase_date', <同生产日期行>, '2', 1);
+-- -- ATTRIBUTE_FORMAT: 2-日期
+-- =============================================================================
+
+-- =============================================================================
+-- 执行前检查（确认列不存在, 避免重复执行报错; DM 数据字典标识符按大写存储）
+-- SELECT OWNER, TABLE_NAME, COLUMN_NAME
+-- FROM ALL_TAB_COLUMNS
+-- WHERE COLUMN_NAME = 'PURCHASE_DATE'
+-- AND OWNER IN ('NGWL_TEST_WMS', 'NGWL_TEST_OMS')
+-- AND TABLE_NAME IN ('RECEIPT_MATERIAL_DETAIL', 'SHELF_MATERIAL_DETAIL',
+-- 'MATERIAL_INVENTORY', 'RESERVATION_MATERIAL_INVENTORY');
+--
+-- 回滚（发布前执行了本脚本需回退时）
+-- ALTER TABLE "NGWL_TEST_WMS"."RECEIPT_MATERIAL_DETAIL" DROP COLUMN PURCHASE_DATE;
+-- ALTER TABLE "NGWL_TEST_WMS"."SHELF_MATERIAL_DETAIL" DROP COLUMN PURCHASE_DATE;
+-- ALTER TABLE "NGWL_TEST_WMS"."MATERIAL_INVENTORY" DROP COLUMN PURCHASE_DATE;
+-- ALTER TABLE "NGWL_TEST_OMS"."RESERVATION_MATERIAL_INVENTORY" DROP COLUMN PURCHASE_DATE;
+--
+-- 发布顺序: 先执行本 DDL 再发布服务（实体带新字段而表无列, MyBatis-Plus insert 会报错）
+-- =============================================================================