feat(wms,oms)：库存管理-库存查询新增进货日期、入库日期查询条件，新增进货日期字段贯通收货-上架-库存全链路

需求：OMS/WMS 库存管理-库存查询页增加查询条件：物料分类（后端已支持，无需改动）、进货日期（新增字段）、入库日期。一、DDL（sql/20260831_wms_oms_add_purchase_date.sql） WMS 收货明细、上架明细、物料库存及 OMS 预留库存共 4 张表新增 PURCHASE_DATE DATE 列，附批次明细配置模板、执行前检查与回滚语句；须先执行 DDL 再发布服务。二、进货日期录入与落库链路（收货→上架→WMS库存→OMS库存） 1、录入入口为收货批次属性「进货日期」标签（批次规则配置，标签须一字不差）， ReceiptMaterialDetailImpl 两处标签解析新增分支； 2、收货明细→上架明细：StockReceiptOrderDomainService 6 处日期拷贝点补 setPurchaseDate（含子项）； 3、上架落库：stockIn/sj 赋值写入 material_inventory； 4、同步 OMS：MaterialInventoryOmsParamDO 新增字段经 Feign omsEdit 传递，写入 reservation_material_inventory； 5、库存行合并键：批次规则勾选后进货日期参与分行（getParam 映射 + selectListByWhere 全等匹配）， OMS omsEdit 行匹配同步按进货日期区分，避免不同进货日期误合并到同一行。三、查询条件（两模块 /list 接口） 1、进货日期：purchaseDate（单日精确）+ purchaseDateStart/purchaseDateEnd（区间，End 含当天）； 2、入库日期：WMS 新增 createTimeStart/createTimeEnd（按库存行创建时间过滤，与 OMS 现有口径一致）； 3、列表/导出返回新增 purchaseDate 字段，分组查询取 MAX(purchase_date)。说明：历史库存进货日期为空，按进货日期查询查不到存量数据（无来源可回填），区间查询会排除空值行。
2026-08-31 13:41:19 +08:00
parent 2d1e4b5912
commit da84b7bb69
26 changed files with 257 additions and 7 deletions
@@ -190,9 +190,12 @@ public class MaterialInventoryDTO extends MaterialBaseDTO {
    private Boolean excludeZeroInventoryQuantity;
    private String expiryDate;
    private String productionDate;
+    /** 进货日期（yyyy-MM-dd，单日精确查询） */
+    private String purchaseDate;
    private String expiryDateStr;
    private String productionDateStr;
    private String updateTimeStr;
+    private String purchaseDateStr;

    private String expiryDateStart;
    private String expiryDateEnd;
@@ -203,4 +206,11 @@ public class MaterialInventoryDTO extends MaterialBaseDTO {
    private String updateTimeStart;
    private String updateTimeEnd;

+    private String purchaseDateStart;
+    private String purchaseDateEnd;
+
+    /** 入库日期（库存行创建时间）区间查询 */
+    private String createTimeStart;
+    private String createTimeEnd;
+
 }
@@ -311,6 +311,12 @@ public class ShelfMaterialDetailDTO 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")
@@ -60,6 +60,8 @@ public class MaterialInventoryApi extends BaseController {
                              @RequestParam(value = "excludeZeroInventoryQuantity", required = false) Boolean excludeZeroInventoryQuantity,
                              @RequestParam(value = "expiryDateStart", required = false) String expiryDateStart,
                              @RequestParam(value = "expiryDateEnd", required = false) String expiryDateEnd,
+                              @RequestParam(value = "purchaseDateStart", required = false) String purchaseDateStart,
+                              @RequestParam(value = "purchaseDateEnd", required = false) String purchaseDateEnd,
                              @RequestParam(value = "orderByExpiryDate", required = false) Boolean orderByExpiryDate)
    {
        if (Boolean.TRUE.equals(excludeZeroInventoryQuantity)) {
@@ -91,8 +93,11 @@ public class MaterialInventoryApi extends BaseController {
        MaterialInventoryDO 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 按到期日倒序分组（与 OMS 库存查询导出一致）
        materialInventoryDO.setOrderByExpiryDate(orderByExpiryDate);
        Date updateTime = materialInventoryDTO.getUpdateTime();
@@ -167,7 +172,7 @@ public class MaterialInventoryApi extends BaseController {
        // materialDetailId 是新接口专用参数（出库单明细ID），库存 DTO 的同名字段语义是「上架单明细ID」，
        // 泄入原查询会生成错误的 a.material_detail_id 条件导致查空，进原查询前显式清除
        materialInventoryDTO.setMaterialDetailId(null);
-        return list(materialInventoryDTO, customerName, excludeZeroInventoryQuantity, expiryDateStart, expiryDateEnd, orderByExpiryDate);
+        return list(materialInventoryDTO, customerName, excludeZeroInventoryQuantity, expiryDateStart, expiryDateEnd, null, null, orderByExpiryDate);
    }

    @ApiOperation("查询物料库存列表不分页；queryRule=hz 时按货主+物料分组（同一物料在不同货主各占一行）")