feat(wms): 盘点单详情investigetionManageDetailList返回批次号、入库日期、生产日期、过期日期

2026-09-08 17:35:29 +08:00
parent 178b7697af
commit 009dc5b3a6
2 changed files with 26 additions and 0 deletions
@@ -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<BatchDetailFeignPO> batchDetailFeignPOList = batchDetailMap.get(materialBaseInfoId);
@@ -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<MaterialMoreDetailPO> 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;
+
 }