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
@@ -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")
@@ -127,6 +127,9 @@ public class ReservationMaterialInventoryImpl extends ServiceImpl<ReservationMat
        String batchNumber = materialInventoryOmsParamDO.getBatchNumber();
        Long materialBaseInfoId = materialInventoryOmsParamDO.getMaterialBaseInfoId();
        Long warehouseId = materialInventoryOmsParamDO.getWarehouseId();
+        // 进货日期参与行匹配：WMS 库存行按批次属性(含进货日期)分行后，OMS 同步按进货日期区分，避免不同进货日期误合并；
+        // 为空时匹配 purchase_date 为空的行，存量行为不变
+        Date purchaseDate = materialInventoryOmsParamDO.getPurchaseDate();
        LambdaQueryWrapper<ReservationMaterialInventory> param = new LambdaQueryWrapper<ReservationMaterialInventory>()
 //                .eq(ReservationMaterialInventory::getInOrderNumber, inOrderNumber)
                //.eq(ReservationMaterialInventory::getLotNumber, lotNumber)
@@ -148,6 +151,11 @@ public class ReservationMaterialInventoryImpl extends ServiceImpl<ReservationMat
        } else {
            param.isNull(ReservationMaterialInventory::getBatchNumber);
        }
+        if (purchaseDate != null) {
+            param.eq(ReservationMaterialInventory::getPurchaseDate, purchaseDate);
+        } else {
+            param.isNull(ReservationMaterialInventory::getPurchaseDate);
+        }
        List<ReservationMaterialInventory> reservationMaterialInventories = materialInventoryMapper.selectList(param);
        if (reservationMaterialInventories != null && reservationMaterialInventories.size() > 0) {
            ReservationMaterialInventory reservationMaterialInventory = reservationMaterialInventories.get(0);
@@ -542,6 +550,7 @@ public class ReservationMaterialInventoryImpl extends ServiceImpl<ReservationMat
 //            materialInventory.setExtAttr4(materialInventoryParamDO.getExtAttr4());
            materialInventory.setExpiryDate(materialInventoryParamDO.getExpiryDate());
 //            materialInventory.setInventoryDate(materialInventoryParamDO.getInventoryDate());
+            materialInventory.setPurchaseDate(materialInventoryParamDO.getPurchaseDate());
            materialInventory.setBatchNumber(materialInventoryParamDO.getBatchNumber());
            String batchNo = materialInventoryParamDO.getBatchNo();
            if (batchNo != null) {
@@ -192,6 +192,12 @@ public class ReservationMaterialInventoryPO extends MaterialBasePO {
    @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")
@@ -217,6 +217,12 @@ public class ReservationMaterialInventoryDO extends MaterialBaseDO {
    @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")
@@ -253,8 +259,11 @@ public class ReservationMaterialInventoryDO extends MaterialBaseDO {
    private String createTimeEnd;
    private String expiryDateStr;
    private String productionDateStr;
+    private String purchaseDateStr;
    private String expiryDateStart;
    private String expiryDateEnd;
+    private String purchaseDateStart;
+    private String purchaseDateEnd;

    @ApiModelProperty("导出按到期日分组排序标识：仅 queryRule=wlExpiry 时生效，true-到期日倒序(日期近的在前、空值最后、0库存靠后)；不传-保持原有排序")
    private Boolean orderByExpiryDate;
@@ -193,5 +193,7 @@ public class ReservationMaterialInventoryDTO extends MaterialBaseDTO {
    private String createTimeEnd;
    private String expiryDate;
    private String productionDate;
+    /** 进货日期（yyyy-MM-dd，单日精确查询） */
+    private String purchaseDate;

 }