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; + }