From 009dc5b3a616607a7424811951ffc9fbf635d6df Mon Sep 17 00:00:00 2001 From: rcx <3084692334@qq.com> Date: Tue, 8 Sep 2026 17:35:29 +0800 Subject: [PATCH] =?UTF-8?q?feat(wms):=20=E7=9B=98=E7=82=B9=E5=8D=95?= =?UTF-8?q?=E8=AF=A6=E6=83=85investigetionManageDetailList=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E6=89=B9=E6=AC=A1=E5=8F=B7=E3=80=81=E5=85=A5=E5=BA=93?= =?UTF-8?q?=E6=97=A5=E6=9C=9F=E3=80=81=E7=94=9F=E4=BA=A7=E6=97=A5=E6=9C=9F?= =?UTF-8?q?=E3=80=81=E8=BF=87=E6=9C=9F=E6=97=A5=E6=9C=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../InvestigationManageApplicationService.java | 8 ++++++++ .../po/InvestigetionManageDetailPO.java | 18 ++++++++++++++++++ 2 files changed, 26 insertions(+) diff --git a/mhd_wms/src/main/java/com/mhd/wms/application/service/investigationManage/InvestigationManageApplicationService.java b/mhd_wms/src/main/java/com/mhd/wms/application/service/investigationManage/InvestigationManageApplicationService.java index ac1d7a603..6cb4ca1d8 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/application/service/investigationManage/InvestigationManageApplicationService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/application/service/investigationManage/InvestigationManageApplicationService.java @@ -225,6 +225,14 @@ public class InvestigationManageApplicationService { if (materialInventoryId != null) { materialInventoryPO = materialInventoryMapper.selectByIdWithBatchAttributes(materialInventoryId); } + + // 从库存表回填批次号、入库日期、生产日期、过期日期（入库日期取库存记录入库时间create_time） + if (materialInventoryPO != null) { + investigetionManageDetailPO.setBatchNumber(materialInventoryPO.getBatchNumber()); + investigetionManageDetailPO.setInboundDate(materialInventoryPO.getCreateTime()); + investigetionManageDetailPO.setProductionDate(materialInventoryPO.getProductionDate()); + investigetionManageDetailPO.setExpiryDate(materialInventoryPO.getExpiryDate()); + } if (materialBaseInfoId != null && batchDetailMap.containsKey(materialBaseInfoId)) { List batchDetailFeignPOList = batchDetailMap.get(materialBaseInfoId); diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/investigetionManageDetail/repository/po/InvestigetionManageDetailPO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/investigetionManageDetail/repository/po/InvestigetionManageDetailPO.java index 656f844a1..848fe54d4 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/investigetionManageDetail/repository/po/InvestigetionManageDetailPO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/investigetionManageDetail/repository/po/InvestigetionManageDetailPO.java @@ -1,6 +1,7 @@ package com.mhd.wms.domain.investigetionManageDetail.repository.po; import com.baomidou.mybatisplus.annotation.TableField; +import com.fasterxml.jackson.annotation.JsonFormat; import com.mhd.common.core.annotation.Excel; import com.mhd.common.core.web.domain.BaseVOEntity; import com.mhd.wms.domain.materialMoreDetail.repository.po.MaterialMoreDetailPO; @@ -9,6 +10,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.math.BigDecimal; +import java.util.Date; import java.util.List; @@ -219,4 +221,20 @@ public class InvestigetionManageDetailPO extends BaseVOEntity { @TableField(exist = false) private List materialMoreDetailList; + @ApiModelProperty("批次号") + @Excel(name = "批次号") + private String batchNumber; + + @ApiModelProperty("入库日期（库存入库时间）") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date inboundDate; + + @ApiModelProperty("生产日期") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date productionDate; + + @ApiModelProperty("过期日期") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date expiryDate; + }